You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2009/09/04 02:29:43 UTC
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
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;
}
}