You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2009/07/31 04:01:38 UTC

svn commit: r799487 - in /tuscany/java/sca/modules: binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListenerManager.java node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeActivator.java

Author: rfeng
Date: Fri Jul 31 02:01:37 2009
New Revision: 799487

URL: http://svn.apache.org/viewvc?rev=799487&view=rev
Log:
Release resources when the OSGi runtime is shutdown to remove the needs of shutdown hooks

Modified:
    tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListenerManager.java
    tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeActivator.java

Modified: tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListenerManager.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListenerManager.java?rev=799487&r1=799486&r2=799487&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListenerManager.java (original)
+++ tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListenerManager.java Fri Jul 31 02:01:37 2009
@@ -84,7 +84,15 @@
     
     public synchronized void stop() throws AxisFault {
     	super.stop();
-    	Runtime.getRuntime().removeShutdownHook(shutdownThread);
+        try {
+            if (shutdownThread != null) {
+                Runtime.getRuntime().removeShutdownHook(shutdownThread);
+                shutdownThread = null;
+            }
+        } catch (IllegalStateException e) {
+            // Ignore
+            shutdownThread = null;
+        }
     }
     
     static class ListenerManagerShutdownThread extends Thread {

Modified: tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeActivator.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeActivator.java?rev=799487&r1=799486&r2=799487&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeActivator.java (original)
+++ tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeActivator.java Fri Jul 31 02:01:37 2009
@@ -88,16 +88,20 @@
 
     public void stop(BundleContext context) throws Exception {
         context.removeBundleListener(this);
-        bundleContext = null;
         controller.stop();
         controller = null;
-//        exporter.stop();
-//        exporter = null;
+
         discoveryActivator.stop(context);
         discoveryActivator = null;
         
         remoteAdmin.stop();
         remoteAdmin = null;
+        
+        manager.stop();
+        bundleContext.removeBundleListener(manager);
+        manager = null;
+        bundleContext = null;
+        inited = false;
     }
 
     public static BundleContext getBundleContext() {