svn commit: r734203 - /tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementImpl.java

[hlship]

Author: hlship
Date: Tue Jan 13 10:13:51 2009
New Revision: 734203

URL: http://svn.apache.org/viewvc?rev=734203&view=rev
Log:
TAP5-449:  @CleanupRender Render phase methods not always invoked

Modified:
    
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementImpl.java

Modified: 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementImpl.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementImpl.java?rev=734203&r1=734202&r2=734203&view=diff
==============================================================================
--- 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementImpl.java
 (original)
+++ 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementImpl.java
 Tue Jan 13 10:13:51 2009
@@ -211,8 +211,8 @@
     }
 
     /**
-     * Replaces {...@link 
org.apache.tapestry5.internal.structure.ComponentPageElementImpl.BeginRenderPhase}
 when there a
-     * handler for AfterRender but not BeginRender.
+     * Replaces {...@link 
org.apache.tapestry5.internal.structure.ComponentPageElementImpl.BeginRenderPhase}
 when there is
+     * a handler for AfterRender but not BeginRender.
      */
     private class OptimizedBeginRenderPhase implements RenderCommand
     {
@@ -619,7 +619,7 @@
 
         if (!handled.contains(BeginRender.class))
         {
-            RenderCommand replacement = handled.contains(AfterRender.class)
+            RenderCommand replacement = afterRenderPhase != null
                                         ? new OptimizedBeginRenderPhase()
                                         : beforeRenderTemplatePhase;