myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ima...@apache.org
Subject svn commit: r398943 - /myfaces/core/branches/1_1_3/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
Date Tue, 02 May 2006 14:33:26 GMT
Author: imario
Date: Tue May  2 07:31:59 2006
New Revision: 398943

URL: http://svn.apache.org/viewcvs?rev=398943&view=rev
Log:
merge-up of r398003 r398009

Modified:
    myfaces/core/branches/1_1_3/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java

Modified: myfaces/core/branches/1_1_3/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
URL: http://svn.apache.org/viewcvs/myfaces/core/branches/1_1_3/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java?rev=398943&r1=398942&r2=398943&view=diff
==============================================================================
--- myfaces/core/branches/1_1_3/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
(original)
+++ myfaces/core/branches/1_1_3/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
Tue May  2 07:31:59 2006
@@ -708,13 +708,19 @@
         {
             Object key = new SerializedViewKey(context);
             _serializedViews.put(key, state);
+
+            while (_keys.remove(key));
             _keys.add(key);
 
             int views = getNumberOfViewsInSession(context);
             while (_keys.size() > views)
             {
                 key = _keys.remove(0);
-                getOldSerializedViewsMap().put(key, _serializedViews.remove(key));
+                Object oldView = _serializedViews.remove(key);
+                if (oldView != null)
+                {
+                    getOldSerializedViewsMap().put(key, oldView);
+                }
             }
         }
 



Mime
View raw message