You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by va...@apache.org on 2010/12/09 13:01:43 UTC

svn commit: r1043918 - /ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java

Author: vanto
Date: Thu Dec  9 12:01:42 2010
New Revision: 1043918

URL: http://svn.apache.org/viewvc?rev=1043918&view=rev
Log:
some GC clean up tweaks during shutdown.

Modified:
    ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java

Modified: ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java?rev=1043918&r1=1043917&r2=1043918&view=diff
==============================================================================
--- ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java (original)
+++ ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java Thu Dec  9 12:01:42 2010
@@ -373,22 +373,25 @@ public class ODEServer {
                 try {
                     __log.debug("shutdown BpelConnector");
                     _connector.shutdown();
+                    _connector = null;
                 } catch (Throwable t) {
                     __log.error("Unable to cleanup temp files.", t);
                 }
             }
-            if(httpConnectionManager!=null){
+            if (httpConnectionManager != null) {
                 __log.debug("shutting down HTTP connection manager.");
                 try {
                     httpConnectionManager.shutdown();
+                    httpConnectionManager = null;
                 } catch(Throwable t) {
                     __log.error("Unable to shut down HTTP connection manager.", t);
                 }
             }
-            if(idleConnectionTimeoutThread!=null){
+            if (idleConnectionTimeoutThread != null) {
                 __log.debug("shutting down Idle Connection Timeout Thread.");
                 try {
                     idleConnectionTimeoutThread.shutdown();
+                    idleConnectionTimeoutThread = null;
                 } catch(Throwable t) {
                     __log.error("Unable to shut down Idle Connection Timeout Thread.", t);
                 }
@@ -400,7 +403,10 @@ public class ODEServer {
                 __log.error("Unable to cleanup temp files.", t);
             }
 
-            _executorService.shutdownNow();
+            if (_executorService != null) {
+                _executorService.shutdownNow();
+                _executorService = null;
+            }
 
             __log.info(__msgs.msgOdeShutdownCompleted());
         } finally {