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/03/06 05:43:23 UTC

svn commit: r1078401 - /myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PhasesLifecycleCallbackPhaseListener.java

Author: gpetracek
Date: Sun Mar  6 04:43:22 2011
New Revision: 1078401

URL: http://svn.apache.org/viewvc?rev=1078401&view=rev
Log:
comments

Modified:
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PhasesLifecycleCallbackPhaseListener.java

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PhasesLifecycleCallbackPhaseListener.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/config/view/PhasesLifecycleCallbackPhaseListener.java?rev=1078401&r1=1078400&r2=1078401&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PhasesLifecycleCallbackPhaseListener.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PhasesLifecycleCallbackPhaseListener.java Sun Mar  6 04:43:22 2011
@@ -60,9 +60,9 @@ public final class PhasesLifecycleCallba
 
     public void afterPhase(PhaseEvent event)
     {
-            processInitView(event);
-            processPostRenderView(event);
-            processPhaseCallbacks(event, false);
+        processInitView(event);
+        processPostRenderView(event);
+        processPhaseCallbacks(event, false);
     }
 
     public void beforePhase(PhaseEvent event)
@@ -87,12 +87,13 @@ public final class PhasesLifecycleCallba
 
     private void processInitView(String viewId)
     {
-        //view already initialized
+        //view already initialized in this or any prev. request
         if(viewId.equals(this.windowContext.getAttribute(INITIALIZED_VIEW_ID_MARKER_KEY, String.class)))
         {
             return;
         }
 
+        //override the view-id if we have a new view
         this.windowContext.setAttribute(INITIALIZED_VIEW_ID_MARKER_KEY, viewId);
 
         ViewConfigEntry viewDefinitionEntry = ViewConfigCache.getViewDefinition(viewId);