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 2011/02/28 19:37:44 UTC

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

Author: gpetracek
Date: Mon Feb 28 18:37:43 2011
New Revision: 1075472

URL: http://svn.apache.org/viewvc?rev=1075472&view=rev
Log:
add deactivation support

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

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowContextAwareViewHandler.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/WindowContextAwareViewHandler.java?rev=1075472&r1=1075471&r2=1075472&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowContextAwareViewHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowContextAwareViewHandler.java Mon Feb 28 18:37:43 2011
@@ -94,6 +94,11 @@ public class WindowContextAwareViewHandl
     @Override
     public UIViewRoot restoreView(FacesContext facesContext, String viewId)
     {
+        if(this.deactivated)
+        {
+            return super.restoreView(facesContext, viewId);
+        }
+
         if(isWindowIdAvailable(facesContext))
         {
             WindowContext windowContext = ConversationUtils.getWindowContextManager().getCurrentWindowContext();