cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/flow AbstractInterpreter.java

[antonio]

antonio     2004/01/19 05:05:11

  Modified:    src/java/org/apache/cocoon/components/flow
                        AbstractInterpreter.java
  Log:
  Changing the if in forwardTo()
  
  Revision  Changes    Path
  1.16      +8 -10     
cocoon-2.1/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java
  
  Index: AbstractInterpreter.java
  ===================================================================
  RCS file: 
/home/cvs//cocoon-2.1/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- AbstractInterpreter.java  19 Jan 2004 12:46:47 -0000      1.15
  +++ AbstractInterpreter.java  19 Jan 2004 13:05:11 -0000      1.16
  @@ -262,16 +262,14 @@
                             Environment environment)
           throws Exception
       {
  -        if (SourceUtil.indexOfSchemeColon(uri) != -1) {
  +        if (SourceUtil.indexOfSchemeColon(uri) == -1) {
  +            uri = "cocoon:/" + uri;
  +            Map objectModel = environment.getObjectModel();
  +            FlowHelper.setWebContinuation(objectModel, continuation);
  +            FlowHelper.setContextObject(objectModel, bizData);
  +            PipelinesNode.getRedirector(environment).redirect(false, uri);
  +        } else {
               throw new Exception("uri is not allowed to contain a scheme 
(cocoon:/ is always automatically used)");
           }
  -        
  -        uri = "cocoon:/" + uri;
  -        
  -        Map objectModel = environment.getObjectModel();
  -        FlowHelper.setWebContinuation(objectModel, continuation);
  -        FlowHelper.setContextObject(objectModel, bizData);
  -        PipelinesNode.getRedirector(environment).redirect(false, uri);
  -        //process(uri, bizData, null, environment);
       }
   }