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

[cziegeler]

cziegeler    2004/05/25 06:42:51

  Modified:    src/java/org/apache/cocoon/components/treeprocessor
                        TreeProcessor.java
  Log:
  Fix component initialization problem with new env handling
  
  Revision  Changes    Path
  1.29      +3 -1      
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.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- TreeProcessor.java        25 May 2004 13:30:10 -0000      1.28
  +++ TreeProcessor.java        25 May 2004 13:42:51 -0000      1.29
  @@ -518,6 +518,7 @@
           // Get a builder
           TreeBuilder builder = 
(TreeBuilder)this.builderSelector.select(this.language);
           ProcessingNode root;
  +        EnvironmentHelper.enterProcessor(this, new 
ComponentManagerWrapper(this.manager), env);
           try {
               if (builder instanceof Recomposable) {
                   ((Recomposable)builder).recompose(this.manager);
  @@ -537,6 +538,7 @@
               
               this.disposableNodes = builder.getDisposableNodes();
           } finally {
  +            EnvironmentHelper.leaveProcessor();
               this.builderSelector.release(builder);
           }