svn commit: r986400 - /myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/RequestStateMap.java

[so...@apache.org]

Author: sobryan
Date: Tue Aug 17 17:17:51 2010
New Revision: 986400

URL: http://svn.apache.org/viewvc?rev=986400&view=rev
Log:
TRINIDAD-1863 - trinidad requeststatemap does not preserve its state between action and render

* Corrected the code to correctly preserve between action and render

Modified:
    myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/RequestStateMap.java

Modified: myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/RequestStateMap.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/RequestStateMap.java?rev=986400&r1=986399&r2=986400&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/RequestStateMap.java (original)
+++ myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/RequestStateMap.java Tue Aug 17 17:17:51 2010
@@ -1,3 +1,4 @@
+
 /*
  *  Licensed to the Apache Software Foundation (ASF) under one
  *  or more contributor license agreements.  See the NOTICE file
@@ -66,6 +67,7 @@ import javax.servlet.ServletRequest;
           if(map == null)
           {
             map = myMap;
+            reqMap.put(_STATE_MAP, map);
           }
           else
           {
@@ -97,7 +99,7 @@ import javax.servlet.ServletRequest;
          Method m = actionResp.getClass().getMethod("setRenderParameter", String.class, String.class);
          String uuid = UUID.randomUUID().toString();
 
-         ec.getRequestMap().put(_STATE_MAP+"."+uuid, this);
+         ec.getSessionMap().put(_STATE_MAP+"."+uuid, this);
          m.invoke(actionResp, _STATE_MAP, uuid);
        }
        catch(Throwable t)
@@ -109,5 +111,7 @@ import javax.servlet.ServletRequest;
    }
    
    private static final String _STATE_MAP = RequestStateMap.class.getName();
+    
+   @SuppressWarnings("compatibility:-6292931291923989771")
    private static final long serialVersionUID = 1L;
  }