You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/08/08 04:55:13 UTC

svn commit: r983339 - /myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultWindowContextManager.java

Author: gpetracek
Date: Sun Aug  8 02:55:12 2010
New Revision: 983339

URL: http://svn.apache.org/viewvc?rev=983339&view=rev
Log:
EXTCDI-40 moved cleanup of window context instances

Modified:
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultWindowContextManager.java

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultWindowContextManager.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultWindowContextManager.java?rev=983339&r1=983338&r2=983339&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultWindowContextManager.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultWindowContextManager.java Sun Aug  8 02:55:12 2010
@@ -129,12 +129,14 @@ public class DefaultWindowContextManager
         }
 
         cleanupInactiveConversations();
-        cleanupInactiveWindowContexts();
     }
 
-    protected void recordCurrentViewAsOldViewId(@Observes @AfterPhase(PhaseId.RENDER_RESPONSE) PhaseEvent phaseEvent)
+    protected void cleanupAndRecordCurrentViewAsOldViewId(
+            @Observes @AfterPhase(PhaseId.RENDER_RESPONSE) PhaseEvent phaseEvent)
     {
         storeCurrentViewIdAsOldViewId(FacesContext.getCurrentInstance());
+
+        cleanupInactiveWindowContexts();
         RequestCache.resetCache();
     }