[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xml-cocoon-cvs
Subject:    svn commit: r524340 -
From:       joerg () apache ! org
Date:       2007-03-31 0:58:38
Message-ID: 20070331005838.305651A983E () eris ! apache ! org
[Download RAW message or body]

Author: joerg
Date: Fri Mar 30 17:58:37 2007
New Revision: 524340

URL: http://svn.apache.org/viewvc?view=rev&rev=524340
Log:
fix lifecycle problems on Cocoon reload caused by nulling static field (thanks to \
Igor Naumov)

Modified:
    cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/src/main/java/org/apache/cocoon/components/web3/impl/Web3DataSourceSelectorImpl.java


Modified: cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/src/main/java/org/apache/cocoon/components/web3/impl/Web3DataSourceSelectorImpl.java
                
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/src \
/main/java/org/apache/cocoon/components/web3/impl/Web3DataSourceSelectorImpl.java?view=diff&rev=524340&r1=524339&r2=524340
 ==============================================================================
--- cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/src/main/java/org/apache/cocoon/components/web3/impl/Web3DataSourceSelectorImpl.java \
                (original)
+++ cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/src/main/java/org/apache/cocoon/components/web3/impl/Web3DataSourceSelectorImpl.java \
Fri Mar 30 17:58:37 2007 @@ -16,23 +16,23 @@
  */
 package org.apache.cocoon.components.web3.impl;
 
-import org.apache.cocoon.components.web3.Web3DataSource;
+import java.util.Enumeration;
+import java.util.Hashtable;
 
 import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.LogEnabled;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.ServiceSelector;
 import org.apache.avalon.framework.service.Serviceable;
 import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.cocoon.util.ClassUtils;
 
-import java.util.Enumeration;
-import java.util.Hashtable;
+import org.apache.cocoon.components.web3.Web3DataSource;
+import org.apache.cocoon.util.ClassUtils;
 
 import EDU.oswego.cs.dl.util.concurrent.Mutex;
 
@@ -50,8 +50,8 @@
     /** The service manager instance */
     protected ServiceManager manager;
     protected Configuration configuration;
-    private static Hashtable pools = new Hashtable();
-    private static Mutex lock = new Mutex();
+    private static final Hashtable pools = new Hashtable();
+    private static final Mutex lock = new Mutex();
 
     /**
      * Set the current <code>ServiceManager</code> instance used by this
@@ -145,8 +145,7 @@
                 enumeration.hasMoreElements();
                 ) {
                 sid = (String) enumeration.nextElement();
-                pool =
-                    (Web3DataSource) Web3DataSourceSelectorImpl.pools.get(sid);
+                pool = (Web3DataSource) Web3DataSourceSelectorImpl.pools.get(sid);
                 pool.dispose();
             }
             Web3DataSourceSelectorImpl.pools.clear();
@@ -154,6 +153,6 @@
         } finally {
             Web3DataSourceSelectorImpl.lock.release();
         }
-        Web3DataSourceSelectorImpl.lock = null;
     }
+
 }


[prev in list] [next in list] [prev in thread] [next in thread]