cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r312592 - in /cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor: DefaultTreeBuilder.java TreeProcessor.java
Date Mon, 10 Oct 2005 09:46:41 GMT
Author: cziegeler
Date: Mon Oct 10 02:46:36 2005
New Revision: 312592

URL: http://svn.apache.org/viewcvs?rev=312592&view=rev
Log:
First dispose old tree processor than create new one

Modified:
    cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java
    cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java?rev=312592&r1=312591&r2=312592&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java
Mon Oct 10 02:46:36 2005
@@ -95,13 +95,13 @@
 
     /**
      * The service manager for the processor that we are building.
-     * It is created by {@link #createServiceManager(Context, Configuration)}.
+     * It is created by {@link #createServiceManager(ClassLoader, Context, Configuration)}.
      */
     private ServiceManager itsManager;
     
     /**
      * The classloader for the processor that we are building.
-     * It is created by {@link #createServiceManager(Context, Configuration)}.
+     * It is created by {@link #createServiceManager(ClassLoader, Context, Configuration)}.
      */
     protected ClassLoader itsClassLoader;
 

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java?rev=312592&r1=312591&r2=312592&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java Mon
Oct 10 02:46:36 2005
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -492,7 +492,6 @@
         final Configuration[] libDirConfigs = classpathConfig.getChildren("lib-dir");   

 
         Map newListeners = new HashMap();
-        int r = 0;
         
         for (int i = 0; i < classDirConfigs.length; i++) {
             final Configuration dirConfig = classDirConfigs[i];
@@ -658,6 +657,11 @@
             }            
         }
         
+        // Dispose the old processor, if any
+        if (oldProcessor != null) {
+            oldProcessor.markForDisposal();
+        }
+
 
         // We have to do a call to enterProcessor() here as during building
         // of the tree, components (e.g. actions) are already instantiated
@@ -747,12 +751,6 @@
         // Switch to the new processor (ensure it's never temporarily null)
         this.concreteProcessor = newProcessor;
         this.lastModified = newLastModified;
-
-        
-        // Dispose the old processor, if any
-        if (oldProcessor != null) {
-            oldProcessor.markForDisposal();
-        }
     }
 
     private ConcreteTreeProcessor createConcreteTreeProcessor() {



Mime
View raw message