svn commit: r265597 - /cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java

[vg...@apache.org]

Author: vgritsenko
Date: Wed Aug 31 15:15:57 2005
New Revision: 265597

URL: http://svn.apache.org/viewcvs?rev=265597&view=rev
Log:
dispose

Modified:
    cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java

Modified: cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java?rev=265597&r1=265596&r2=265597&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java Wed Aug 31 15:15:57 2005
@@ -108,7 +108,7 @@
     protected ServletContext servletContext;
 
     /** The classloader that will be set as the context classloader if init-classloader is true */
-    protected final ClassLoader classLoader = this.getClass().getClassLoader();
+    protected ClassLoader classLoader = getClass().getClassLoader();
 
     /**
      * This is the path to the servlet context (or the result
@@ -252,10 +252,18 @@
      */
     public void destroy() {
         this.servletContext.log("Destroying Cocoon Servlet.");
-        if ( this.coreUtil != null ) {
+        if (this.coreUtil != null) {
             this.coreUtil.destroy();
             this.coreUtil = null;
+            // coreUtil will dispose it.
+            this.cocoon = null;
         }
+
+        this.requestFactory = null;
+        this.servletContext = null;
+        this.environmentContext = null;
+        this.classLoader = null;
+        this.log = null;
         super.destroy();
     }