You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ri...@apache.org on 2005/06/01 18:50:59 UTC
svn commit: r179392 -
/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java
Author: rich
Date: Wed Jun 1 09:50:57 2005
New Revision: 179392
URL: http://svn.apache.org/viewcvs?rev=179392&view=rev
Log:
Fixed to fire 'exceptionHandled' on the PageFlowEventReporter after an exception is handled by a method.
tests: bvt in netui (WinXP)
BB: self (linux)
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java
Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java?rev=179392&r1=179391&r2=179392&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java Wed Jun 1 09:50:57 2005
@@ -157,17 +157,22 @@
//
// First, see if it should be handled by invoking a handler method.
//
+ ActionForward ret = null;
if ( exceptionConfig instanceof PageFlowExceptionConfig )
{
PageFlowExceptionConfig pfExceptionConfig = ( PageFlowExceptionConfig ) exceptionConfig;
if ( pfExceptionConfig.isHandlerMethod() )
{
- return invokeExceptionHandlerMethod( context, ex, pfExceptionConfig, form, actionMapping );
+ ret = invokeExceptionHandlerMethod( context, ex, pfExceptionConfig, form, actionMapping );
}
}
-
- ActionForward ret = invokeExceptionHandlerClass( context, ex, exceptionConfig, actionMapping, form );
+
+ if ( ret == null )
+ {
+ ret = invokeExceptionHandlerClass( context, ex, exceptionConfig, actionMapping, form );
+ }
+
// Callback to the event reporter.
long timeTaken = System.currentTimeMillis() - startTime;
_eventReporter.exceptionHandled( ex, actionMapping, form, flowController, request, response, ret, timeTaken );