Don't setPerRequestState with null

9 years ago · 9295099ed5
parent 05a2ddfe79
commit 9295099ed5
1 changed files with 2 additions and 1 deletions
--- a/beehive-netui-core/src/main/java/org/apache/beehive/netui/pageflow/FlowController.java
+++ b/beehive-netui-core/src/main/java/org/apache/beehive/netui/pageflow/FlowController.java
@ -589,7 +589,8 @@ public abstract class FlowController extends PageFlowManagedObject
        }
        finally
        {
-            setPerRequestState( prevState );
+            if(prevState != null)
+                setPerRequestState( prevState );

            PageFlowControlContainer pfcc = PageFlowControlContainerFactory.getControlContainer(request,getServletContext());
            pfcc.endContextOnPageFlow(this);