svn commit: r154180 - incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java

[rich]

Author: rich
Date: Thu Feb 17 11:39:10 2005
New Revision: 154180

URL: http://svn.apache.org/viewcvs?view=rev&rev=154180
Log:
Fix for http://issues.apache.org/jira/browse/BEEHIVE-311 : 
return-to='currentPage' doesn't do anything when their isn't a current page in 
the pageflow

DRT/BVT: netui (WinXP)
BB: self (linux)


Modified:
    
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java?view=diff&r1=154179&r2=154180
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java
 Thu Feb 17 11:39:10 2005
@@ -908,7 +908,10 @@
         if ( request != null && effect.causeMayBeSessionExpiration() && 
sessionExpired( request ) )
         {
             PageflowConfig pfc = ConfigUtil.getConfig().getPageflowConfig();
-            if ( pfc != null && pfc.getThrowSessionExpiredException() ) throw 
new SessionExpiredException( effect );
+            if ( pfc == null || ! pfc.isSetThrowSessionExpiredException() || 
pfc.getThrowSessionExpiredException() )
+            {
+                throw new SessionExpiredException( effect );
+            }
         }
         
         throw effect;