myfaces-commits mailing list archives

Author: bdudney
Date: Mon Oct  3 08:35:41 2005
New Revision: 293368

URL: http://svn.apache.org/viewcvs?rev=293368&view=rev
Log:
Fix for 657 that works for 628

Modified:
    myfaces/impl/branches/1_1_1/src/java/org/apache/myfaces/lifecycle/LifecycleImpl.java

Modified: myfaces/impl/branches/1_1_1/src/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
URL: http://svn.apache.org/viewcvs/myfaces/impl/branches/1_1_1/src/java/org/apache/myfaces/lifecycle/LifecycleImpl.java?rev=293368&r1=293367&r2=293368&view=diff
==============================================================================
--- myfaces/impl/branches/1_1_1/src/java/org/apache/myfaces/lifecycle/LifecycleImpl.java (original)
+++ myfaces/impl/branches/1_1_1/src/java/org/apache/myfaces/lifecycle/LifecycleImpl.java Mon
Oct  3 08:35:41 2005
@@ -291,7 +291,7 @@
         if (log.isTraceEnabled()) log.trace("entering renderResponse in " + LifecycleImpl.class.getName());
 
         informPhaseListenersBefore(facesContext, PhaseId.RENDER_RESPONSE);
-        if(shouldSkipPhaseProcessing(facesContext, "render"))
+        if(shouldSkipRenderResponsePhaseProcessing(facesContext))
         {
         		return;
         }
@@ -321,19 +321,29 @@
     		boolean flag = false;
         if (facesContext.getResponseComplete())
         {
-            if (log.isDebugEnabled()) log.debug("exiting render in " + LifecycleImpl.class.getName()
+ " (--> response complete)");
+            if (log.isDebugEnabled()) log.debug("exiting render in " + phase + " (-->
response complete)");
             flag = true;
         }
 
         if (facesContext.getRenderResponse())
         {
-            if (log.isDebugEnabled()) log.debug("exiting render in " + LifecycleImpl.class.getName()
+ " (--> render response)");
+            if (log.isDebugEnabled()) log.debug("exiting render in " + phase + " (-->
render response)");
             flag = true;
         }
         return flag;
 	}
 
-	private static String deriveViewId(FacesContext facesContext)
+    private boolean shouldSkipRenderResponsePhaseProcessing(FacesContext facesContext) {
+		boolean flag = false;
+        if (facesContext.getResponseComplete())
+        {
+            if (log.isDebugEnabled()) log.debug("exiting render in render (--> response
complete)");
+            flag = true;
+        }
+        return flag;
+    }
+
+    private static String deriveViewId(FacesContext facesContext)
     {
         ExternalContext externalContext = facesContext.getExternalContext();