You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@cocoon.apache.org by vg...@apache.org on 2005/08/31 23:36:57 UTC

svn commit: r265588 - /cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java

Author: vgritsenko
Date: Wed Aug 31 14:36:53 2005
New Revision: 265588

URL: http://svn.apache.org/viewcvs?rev=265588&view=rev
Log:
null out Cocoon instance on dispose

Modified:
    cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java

Modified: cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java?rev=265588&r1=265587&r2=265588&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java Wed Aug 31 14:36:53 2005
@@ -131,7 +131,7 @@
 
         // HACK: Provide a way to share an instance of Cocoon object between
         //       several servlets/portlets.
-        instance = this;
+        Cocoon.instance = this;
     }
 
     /**
@@ -368,6 +368,9 @@
             this.parentServiceManager = null;
         }
         this.context = null;
+        if (Cocoon.instance == this) {
+            Cocoon.instance = null;
+        }
         this.disposed = true;
     }