You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/12/11 02:33:09 UTC
svn commit: r1044557 -
/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/CodiNavigationHandler.java
Author: gpetracek
Date: Sat Dec 11 01:33:09 2010
New Revision: 1044557
URL: http://svn.apache.org/viewvc?rev=1044557&view=rev
Log:
EXTCDI-94
Modified:
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/CodiNavigationHandler.java
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/CodiNavigationHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/CodiNavigationHandler.java?rev=1044557&r1=1044556&r2=1044557&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/CodiNavigationHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/CodiNavigationHandler.java Sat Dec 11 01:33:09 2010
@@ -69,7 +69,7 @@ public class CodiNavigationHandler exten
public void handleNavigation(FacesContext context, String fromAction, String outcome)
{
- if(this.deactivated)
+ if(this.deactivated || isUnhandledExceptionQueued(context))
{
this.wrapped.handleNavigation(context, fromAction, outcome);
}
@@ -79,6 +79,12 @@ public class CodiNavigationHandler exten
}
}
+ private boolean isUnhandledExceptionQueued(FacesContext context)
+ {
+ return context.getExceptionHandler().getUnhandledExceptionQueuedEvents() != null &&
+ context.getExceptionHandler().getUnhandledExceptionQueuedEvents().iterator().hasNext();
+ }
+
private NavigationHandler getWrappedNavigationHandler()
{
ViewConfigAwareNavigationHandler viewConfigAwareNavigationHandler =