Author: awiner
Date: Wed Dec 20 21:03:21 2006
New Revision: 489262
URL: http://svn.apache.org/viewvc?view=rev&rev=489262
Log:
Fix state manager to properly pay attention to
org.apache.myfaces.trinidad.CACHE_VIEW_ROOT config flag
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java?view=diff&rev=489262&r1=489261&r2=489262
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
Wed Dec 20 21:03:21 2006
@@ -84,7 +84,6 @@
static public final String USE_APPLICATION_VIEW_CACHE_INIT_PARAM =
"org.apache.myfaces.trinidad.USE_APPLICATION_VIEW_CACHE";
- // =-=AEW Should this really be public?
static public final String CACHE_VIEW_ROOT_INIT_PARAM =
"org.apache.myfaces.trinidad.CACHE_VIEW_ROOT";
@@ -270,8 +269,6 @@
// Sadly, we can't save just a SerializedView, because we should
// save a serialized object, and SerializedView is a *non*-static
// inner class of StateManager
- // -= Simon Lessard =-
- // FIXME: pageState is never read
PageState pageState = new PageState(
context,
structure,
@@ -280,7 +277,7 @@
// if this feature has not been disabled
_useViewRootCache(context) ? root : null);
- token = cache.addNewEntry(new PageState(context, structure, state,
root),
+ token = cache.addNewEntry(pageState,
stateMap);
}
// If we got the "applicationViewCache", we're using it.
