tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lrese...@apache.org
Subject svn commit: r811190 - /tuscany/branches/sca-java-1.x/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java
Date Fri, 04 Sep 2009 00:29:43 GMT
Author: lresende
Date: Fri Sep  4 00:29:43 2009
New Revision: 811190

URL: http://svn.apache.org/viewvc?rev=811190&view=rev
Log:
TUSCANY-3260 - Merging workaround provided by rfeng on the 1.5.1 branch to fix ORB shutdown

Modified:
    tuscany/branches/sca-java-1.x/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java

Modified: tuscany/branches/sca-java-1.x/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java?rev=811190&r1=811189&r2=811190&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java
(original)
+++ tuscany/branches/sca-java-1.x/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java
Fri Sep  4 00:29:43 2009
@@ -172,7 +172,6 @@
         // only destroy this if we created the orb instance.
         if (createdOrb != null) {
             createdOrb.shutdown(false);
-            createdOrb.destroy();
             
             try {
                 // This is a workaround to close the sockets for SUN ORB
@@ -189,6 +188,10 @@
             } catch (Throwable e) {
                 // Ignore
             }
+
+            // Call destroy after close the acceptors
+            // In JDK 1.6u14 or later, destroy clean up the acceptors but it doesn't close
them
+            createdOrb.destroy();            
             createdOrb = null;
         }
     }



Mime
View raw message