midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-859 NPE on Attachment where is not storage provider configured / Show cause of problems when toolbar buttons cannot action

This commit is contained in:
Carlos Ruiz 2013-04-20 12:24:42 -05:00
parent 268acba0f6
commit 1ab95f22bb
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
org.adempiere.base/src/org/compiere/model/MStorageProvider.java
View File

@ -21,6 +21,7 @@ import java.util.Properties;
import org.adempiere.base.Service;
import org.adempiere.base.ServiceQuery;
import org.adempiere.exceptions.AdempiereException;
public class MStorageProvider extends X_AD_StorageProvider {
/**
@ -43,8 +44,8 @@ public class MStorageProvider extends X_AD_StorageProvider {
method = "DB";
query.put("method", method);
IAttachmentStore store = Service.locator().locate(IAttachmentStore.class, query).getService();
if (store == null){
log.saveError("Error", "No attachment storage provider found");
if (store == null) {
throw new AdempiereException("No attachment storage provider found");
}
return store;
}
@ -56,8 +57,8 @@ public class MStorageProvider extends X_AD_StorageProvider {
method = "DB";
query.put("method", method);
IArchiveStore store = Service.locator().locate(IArchiveStore.class, query).getService();
if (store == null){
log.saveError("Error", "No archive storage provider found");
if (store == null) {
throw new AdempiereException("No archive storage provider found");
}
return store;
}

38
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java
View File

@ -17,7 +17,6 @@
package org.adempiere.webui.adwindow;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.HashMap;
@ -36,6 +35,7 @@ import org.adempiere.webui.component.ToolBarButton;
import org.adempiere.webui.event.ToolbarListener;
import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.theme.ThemeManager;
import org.adempiere.webui.window.FDialog;
import org.compiere.model.MRole;
import org.compiere.model.MToolBarButton;
import org.compiere.model.MToolBarButtonRestrict;
@ -43,6 +43,7 @@ import org.compiere.model.X_AD_ToolBarButton;
import org.compiere.util.CLogger;
import org.compiere.util.Env;
import org.compiere.util.Msg;
import org.compiere.util.ValueNamePair;
import org.zkoss.image.AImage;
import org.zkoss.zk.au.out.AuScript;
import org.zkoss.zk.ui.Component;
@ -355,25 +356,24 @@ public class ADWindowToolbar extends FToolbar implements EventListener<Event>
Method method = tListener.getClass().getMethod(methodName, (Class[]) null);
method.invoke(tListener, (Object[]) null);
}
catch(SecurityException e)
catch (Exception e)
{
log.log(Level.SEVERE, "Could not invoke Toolbar listener method: " + methodName + "()", e);
}
catch(NoSuchMethodException e)
{
log.log(Level.SEVERE, "Could not invoke Toolbar listener method: " + methodName + "()", e);
}
catch(IllegalArgumentException e)
{
log.log(Level.SEVERE, "Could not invoke Toolbar listener method: " + methodName + "()", e);
}
catch(IllegalAccessException e)
{
log.log(Level.SEVERE, "Could not invoke Toolbar listener method: " + methodName + "()", e);
}
catch(InvocationTargetException e)
{
log.log(Level.SEVERE, "Could not invoke Toolbar listener method: " + methodName + "()", e);
String msg = null;
ValueNamePair vp = CLogger.retrieveError();
if (vp != null) {
msg = vp.getName();
}
if (msg == null) {
Throwable cause = e.getCause();
if (cause != null) {
msg = cause.getLocalizedMessage();
}
}
if (msg == null) {
msg = "Could not invoke Toolbar listener method: " + methodName + "()";
}
FDialog.error(windowNo, this, "Error", msg);
log.log(Level.SEVERE, msg, e);
}
}
this.event = null;