diff options
Diffstat (limited to 'branches/sca-java-1.x/modules/host-corba-jse')
-rw-r--r-- | branches/sca-java-1.x/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/branches/sca-java-1.x/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java b/branches/sca-java-1.x/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java index 77617a6c5c..74dd0fdc97 100644 --- a/branches/sca-java-1.x/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java +++ b/branches/sca-java-1.x/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java @@ -172,7 +172,6 @@ public class TransientNameService { // 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 @@ public class TransientNameService { } 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; } } |