You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sc...@apache.org on 2006/05/15 19:39:48 UTC
svn commit: r406690 -
/myfaces/core/branches/1_1_3/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
Author: schof
Date: Mon May 15 10:39:47 2006
New Revision: 406690
URL: http://svn.apache.org/viewcvs?rev=406690&view=rev
Log:
Reverted Mario's merge from trunk (r398943) since it didn't make it into the release.
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=406690&r1=406689&r2=406690&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 Mon May 15 10:39:47 2006
@@ -708,19 +708,13 @@
{
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);
- Object oldView = _serializedViews.remove(key);
- if (oldView != null)
- {
- getOldSerializedViewsMap().put(key, oldView);
- }
+ getOldSerializedViewsMap().put(key, _serializedViews.remove(key));
}
}