You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@struts.apache.org by ap...@apache.org on 2007/02/28 12:14:50 UTC

svn commit: r512704 - /struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/commands/TilesPreProcessor.java

Author: apetrelli
Date: Wed Feb 28 03:14:48 2007
New Revision: 512704

URL: http://svn.apache.org/viewvc?view=rev&rev=512704
Log:
The forwardConfig must be reset only if a definition is found.

Modified:
    struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/commands/TilesPreProcessor.java

Modified: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/commands/TilesPreProcessor.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/commands/TilesPreProcessor.java?view=diff&rev=512704&r1=512703&r2=512704
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/commands/TilesPreProcessor.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/commands/TilesPreProcessor.java Wed Feb 28 03:14:48 2007
@@ -106,6 +106,7 @@
                 sacontext.getRequest(), sacontext.getResponse())) {
 	        container.render(forwardConfig.getPath(), 
                     sacontext.getRequest(), sacontext.getResponse());
+            sacontext.setForwardConfig(null);
         } else {
             // ignore not found
         	if (log.isDebugEnabled()) {
@@ -114,7 +115,6 @@
         	}
         }
         
-        sacontext.setForwardConfig(null);
         return false;
     }
 }