cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From un...@apache.org
Subject svn commit: rev 55841 - cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components
Date Thu, 28 Oct 2004 13:09:19 GMT
Author: unico
Date: Thu Oct 28 06:09:17 2004
New Revision: 55841

Modified:
   cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/CocoonComponentManager.java
Log:
EnvironmentDescriptor must be released before the Environment is cleaned
because it still needs a working environment during release. 
This fixes a NPE that occurred in certain scenarios.

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/CocoonComponentManager.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/CocoonComponentManager.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/CocoonComponentManager.java
Thu Oct 28 06:09:17 2004
@@ -213,9 +213,9 @@
      *         {@link #startProcessing(Environment)}.
      */
     public static void endProcessing(Environment env, Object key) {
-        env.finishingProcessing();
         ((EnvironmentDescription) key).release();
         env.getObjectModel().remove(PROCESS_KEY);
+        env.finishingProcessing();
     }
 
     /**

Mime
View raw message