svn commit: r356545 - /beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestImpl.java

[cr...@apache.org]

Author: crogers
Date: Tue Dec 13 09:29:12 2005
New Revision: 356545

URL: http://svn.apache.org/viewcvs?rev=356545&view=rev
Log:
Another change for http://issues.apache.org/jira/browse/BEEHIVE-1020 - Move the persisting of ScopedRequest attributes out of the beehive NetUI layer.

In the now depricated ScopedRequestImpl.restoreAttributes() method we should only call the new setAttributeMap() if the saved attributes are not null to avoid a NPE in code still using the depricated methods.

tests: drt in netui (WinXP)
BB: self


Modified:
    beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestImpl.java

Modified: beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestImpl.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestImpl.java?rev=356545&r1=356544&r2=356545&view=diff
==============================================================================
--- beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestImpl.java (original)
+++ beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestImpl.java Tue Dec 13 09:29:12 2005
@@ -455,7 +455,11 @@
     {
         String attrName = getScopedName( STORED_ATTRS_ATTR );
         Map savedAttrs = ( Map ) getSession().getAttribute( attrName );
-        setAttributeMap( savedAttrs );
+
+        if ( savedAttrs != null )
+        {
+            setAttributeMap( savedAttrs );
+        }
     }
 
     /**