Author: rich
Date: Tue Jun 7 12:32:10 2005
New Revision: 188851
URL: http://svn.apache.org/viewcvs?rev=188851&view=rev
Log:
This is a contribution from Carlin Rogers to address
http://issues.apache.org/jira/browse/BEEHIVE-779 :
ScopedRequestImpl.restoreAttributes() should not point the
ScopedAttributeContainer at the Session's stored attribute HashMap instance
tests: drt in trunk (WinXP)
BB: self (linux)
Modified:
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestImpl.java
incubator/beehive/trunk/samples/netui-samples/tiles/MainFlow.java
Modified:
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestImpl.java?rev=188851&r1=188850&r2=188851&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestImpl.java
(original)
+++
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestImpl.java
Tue Jun 7 12:32:10 2005
@@ -455,12 +455,15 @@
if ( savedAttrs != null )
{
+ Map attrs = new HashMap();
+ attrs.putAll( savedAttrs );
+
if ( currentAttrs != null )
{
- savedAttrs.putAll( currentAttrs );
+ attrs.putAll( currentAttrs );
}
- _scopedContainer.setAttrMap( savedAttrs );
+ _scopedContainer.setAttrMap( attrs );
}
}
Modified: incubator/beehive/trunk/samples/netui-samples/tiles/MainFlow.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/tiles/MainFlow.java?rev=188851&r1=188850&r2=188851&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/tiles/MainFlow.java (original)
+++ incubator/beehive/trunk/samples/netui-samples/tiles/MainFlow.java Tue Jun
7 12:32:10 2005
@@ -23,7 +23,7 @@
import org.apache.beehive.netui.pageflow.annotations.Jpf;
@Jpf.Controller(
- tilesDefinitionsConfigs = {
+ tilesDefinitionsConfigs={
"/WEB-INF/tiles-defs.xml"
},
simpleActions={
