cvs commit: xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor DefaultTreeBuilder.java

[sylvain]

sylvain     02/04/03 02:55:17

  Modified:    src/java/org/apache/cocoon/components/treeprocessor
                        DefaultTreeBuilder.java
  Log:
  Fix bug #7460
  Reported by: Volker Schmitt ([EMAIL PROTECTED])
  
  Revision  Changes    Path
  1.3       +11 -5     
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java
  
  Index: DefaultTreeBuilder.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultTreeBuilder.java   18 Mar 2002 07:15:13 -0000      1.2
  +++ DefaultTreeBuilder.java   3 Apr 2002 10:55:17 -0000       1.3
  @@ -93,7 +93,7 @@
   /**
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
  - * @version CVS $Id: DefaultTreeBuilder.java,v 1.2 2002/03/18 07:15:13 cziegeler 
Exp $
  + * @version CVS $Id: DefaultTreeBuilder.java,v 1.3 2002/04/03 10:55:17 sylvain Exp $
    */
   
   public class DefaultTreeBuilder extends AbstractLoggable implements TreeBuilder,
  @@ -110,14 +110,14 @@
       protected LogKitManager logKit;
   
       /**
  -     * The parent component manager, set using <code>compose()</code> 
(implementation of
  -     * <code>Composable</code>).
  +     * The parent component manager, set using <code>compose()</code> and 
<code>recompose()</code>
  +     * (implementation of <code>Recomposable</code>).
        */
       protected ComponentManager parentManager;
   
       /**
        * The parent role manager, set using <code>setRoleManager</code> 
(implementation of
  -     * <code>createRoleManager</code>).
  +     * <code>RoleManageable</code>).
        */
       protected RoleManager parentRoleManager;
   
  @@ -561,10 +561,16 @@
       public void recycle() {
           this.lifecycle = null; // Created in build()
           this.initializableNodes.clear();
  -        this.disposableNodes.clear();
           this.linkedBuilders.clear();
           this.canGetNode = false;
           this.registeredNodes.clear();
  +        
  +        // Don't clear disposableNodes as they're used by the Processor
  +        this.disposableNodes = new ArrayList();
  +
  +        this.processor = null;
  +        this.manager = null;
  +        this.roleManager = null;
       }
   
       public void dispose() {
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]