cvs commit: jakarta-turbine/src/java/org/apache/turbine/pipeline ClassicPipeline.java

[jvanzyl]

jvanzyl     01/07/13 14:32:07

  Modified:    src/java/org/apache/turbine/pipeline ClassicPipeline.java
  Log:
  - quick hacky fix for jon to get scarab working. will cleanup
    this weekend.
  
  Revision  Changes    Path
  1.4       +11 -4     
jakarta-turbine/src/java/org/apache/turbine/pipeline/ClassicPipeline.java
  
  Index: ClassicPipeline.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/pipeline/ClassicPipeline.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ClassicPipeline.java      2001/07/12 20:22:54     1.3
  +++ ClassicPipeline.java      2001/07/13 21:32:06     1.4
  @@ -103,11 +103,18 @@
           // specified by the 'template' paramter.
           StringBuffer sb = new StringBuffer();
           
  -        Resolver.parseTemplatePath(
  -            data.getParameters().getString("template"),sb);
  +        // The target may have been set in an action
  +        // so must preserve what was set.
  +        String target = data.getTarget();
           
  -        String target = sb.toString();
  -        data.setTarget(target);
  +        if (target == null)
  +        {
  +            Resolver.parseTemplatePath(
  +                data.getParameters().getString("template"),sb);
  +        
  +            target = sb.toString();
  +            data.setTarget(target);
  +        }
   
           String targetModuleType = Turbine.getConfiguration().getString(
               "pipeline.default.targetModuleType");
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]