cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor TreeProcessor.java

[cziegeler]

cziegeler    2004/05/04 23:36:58

  Modified:    src/java/org/apache/cocoon/components/treeprocessor
                        TreeProcessor.java
  Log:
  Remove the key before the om is copied
  
  Revision  Changes    Path
  1.26      +4 -3      
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
  
  Index: TreeProcessor.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- TreeProcessor.java        4 May 2004 11:54:35 -0000       1.25
  +++ TreeProcessor.java        5 May 2004 06:36:58 -0000       1.26
  @@ -359,9 +359,10 @@
               environment = facade.getDelegate();
           }
           
  -        Environment newEnv = new ForwardEnvironmentWrapper(environment, 
this.manager, uri, getLogger());
           // test if this is a call from flow
  -        if ( environment.getObjectModel().remove("cocoon:forward") == null ) 
{
  +        boolean isRedirect = 
(environment.getObjectModel().remove("cocoon:forward") == null);
  +        Environment newEnv = new ForwardEnvironmentWrapper(environment, 
this.manager, uri, getLogger());
  +        if ( isRedirect ) {
               ((ForwardEnvironmentWrapper)newEnv).setInternalRedirect(true);
           }