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

[gp...@apache.org]

Author: gpetracek
Date: Wed Jul 28 20:41:42 2010
New Revision: 980202

URL: http://svn.apache.org/viewvc?rev=980202&view=rev
Log:
EXTCDI-1, EXTCDI-2 and EXTCDI-3 cleanup

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=980202&r1=980201&r2=980202&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 Wed Jul 28 20:41:42 2010
@@ -122,7 +122,8 @@ public class DefaultWindowContextManager
         //for performance reasons + cleanup at the beginning of the request (check timeout,...)
         //+ we aren't allowed to cleanup in case of redirects
         //we would transfer the restored view-id into the conversation
-        if (isPartialOrGetRequest(requestTypeResolver))
+        //don't ignore partial requests - in case of ajax-navigation we wouldn't check for expiration
+        if (!requestTypeResolver.isPostRequest())
         {
             return;
         }
@@ -143,11 +144,6 @@ public class DefaultWindowContextManager
         JsfUtils.resetCaches();
     }
 
-    private boolean isPartialOrGetRequest(RequestTypeResolver requestTypeResolver)
-    {
-        return requestTypeResolver.isPartialRequest() || !requestTypeResolver.isPostRequest();
-    }
-
     private void cleanupInactiveConversations()
     {
         //don't cleanup all window contexts (it would cause a side-effect with the access-scope and multiple windows