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 @@ * [EMAIL PROTECTED] #startProcessing(Environment)}. */ public static void endProcessing(Environment env, Object key) { - env.finishingProcessing(); ((EnvironmentDescription) key).release(); env.getObjectModel().remove(PROCESS_KEY); + env.finishingProcessing(); } /**