You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jm...@apache.org on 2002/02/16 00:36:30 UTC
cvs commit: jakarta-turbine-3/src/java/org/apache/turbine/pipeline RunModulesValve.java
jmcnally 02/02/15 15:36:30
Modified: src/java/org/apache/turbine/pipeline RunModulesValve.java
Log:
stop executing Modules if the target has been set to null
Revision Changes Path
1.5 +7 -4 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/RunModulesValve.java
Index: RunModulesValve.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/RunModulesValve.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RunModulesValve.java 24 Jan 2002 03:55:26 -0000 1.4
+++ RunModulesValve.java 15 Feb 2002 23:36:30 -0000 1.5
@@ -74,7 +74,7 @@
* release 2
*
* @author <a href="mailto:jtaylor@apache.org">James Taylor</a>
- * @version $Id: RunModulesValve.java,v 1.4 2002/01/24 03:55:26 jvanzyl Exp $
+ * @version $Id: RunModulesValve.java,v 1.5 2002/02/15 23:36:30 jmcnally Exp $
*/
public class RunModulesValve
extends AbstractValve
@@ -135,7 +135,7 @@
target = normalizeTarget( data.getTarget() );
- while( ! oldTarget.equals( target ) )
+ while( ! oldTarget.equals( target ) && target != null )
{
module = resolver.getModule( moduleType, target );
@@ -148,9 +148,12 @@
module.execute( data );
// Modules might change the target:
-
oldTarget = target;
- target = normalizeTarget( data.getTarget() );
+ target = data.getTarget();
+ if ( target != null )
+ {
+ target = normalizeTarget(target);
+ }
}
// Set the target to the final normalized path, which will be used by
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>