You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by st...@apache.org on 2010/12/16 15:04:44 UTC

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

Author: struberg
Date: Thu Dec 16 14:04:43 2010
New Revision: 1049979

URL: http://svn.apache.org/viewvc?rev=1049979&view=rev
Log:
EXTCDI-98 allow unknown windowIds in ClientSideWindowHandler

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

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ClientSideWindowHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ClientSideWindowHandler.java?rev=1049979&r1=1049978&r2=1049979&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ClientSideWindowHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ClientSideWindowHandler.java Thu Dec 16 14:04:43 2010
@@ -65,6 +65,10 @@ public class ClientSideWindowHandler ext
     @Inject
     private RequestTypeResolver requestTypeResolver;
 
+    @Inject
+    private WindowContextConfig windowContextConfig;
+
+
     protected ClientSideWindowHandler()
     {
         // needed for proxying
@@ -130,8 +134,9 @@ public class ClientSideWindowHandler ext
         }
         else
         {
-            if (WindowContextManager.AUTOMATED_ENTRY_POINT_PARAMETER_KEY.equals(windowId)
-                    || !ConversationUtils.isWindowActive(this.windowContextManager, windowId))
+            if (WindowContextManager.AUTOMATED_ENTRY_POINT_PARAMETER_KEY.equals(windowId) ||
+                (!windowContextConfig.isUnknownWindowIdsAllowed() &&
+                 !ConversationUtils.isWindowActive(this.windowContextManager, windowId)))
             {
                 // no or invalid windowId --> create new one
                 // don't use createWindowId() the following call will ensure the max. window context count,...