Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-07 07:37:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds proper exception handling during calling action

Browse Source 
This will allow ExceptionHandler to work
This commit is contained in:
Lukasz Lenart
2014-09-23 21:44:50 +02:00
parent 4f4f526002
commit 3b9d58614f
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
+12 -4
View File
@@ -28,6 +28,8 @@ import com.opensymphony.xwork2.util.ValueStackFactory;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import com.opensymphony.xwork2.util.profiling.UtilTimerStack;
import ognl.MethodFailedException;
import ognl.NoSuchPropertyException;
import ognl.OgnlException;
import java.util.ArrayList;
@@ -439,17 +441,23 @@ public class DefaultActionInvocation implements ActionInvocation {
}
}
return saveResult(actionConfig, methodResult);
} catch (OgnlException e) {
} catch (NoSuchPropertyException e) {
throw new IllegalArgumentException("The " + methodName + "() is not defined in action " + getAction().getClass() + "");
} catch (MethodFailedException e) {
// We try to return the source exception.
//Throwable t = e.getTargetException();
Throwable t = e.getCause();
if (actionEventListener != null) {
String result = actionEventListener.handleException(e, getStack());
String result = actionEventListener.handleException(t, getStack());
if (result != null) {
return result;
}
}
throw e;
if (t instanceof Exception) {
throw (Exception) t;
} else {
throw e;
}
} finally {
UtilTimerStack.pop(timerKey);
}