svn commit: r755478 - /geronimo/server/branches/2.1.4/plugins/corba/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/ORBConfigAdapter.java

[xu...@apache.org]

Author: xuhaihong
Date: Wed Mar 18 05:13:32 2009
New Revision: 755478

URL: http://svn.apache.org/viewvc?rev=755478&view=rev
Log:
GERONIMO-4529 Corba port 1050 is not released after stopping j2ee-corba-yoko configuration. Thanks Gang Yin for the patch !

Modified:
    geronimo/server/branches/2.1.4/plugins/corba/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/ORBConfigAdapter.java

Modified: geronimo/server/branches/2.1.4/plugins/corba/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/ORBConfigAdapter.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.4/plugins/corba/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/ORBConfigAdapter.java?rev=755478&r1=755477&r2=755478&view=diff
==============================================================================
--- geronimo/server/branches/2.1.4/plugins/corba/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/ORBConfigAdapter.java (original)
+++ geronimo/server/branches/2.1.4/plugins/corba/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/ORBConfigAdapter.java Wed Mar 18 05:13:32 2009
@@ -170,18 +170,26 @@
      */
     public Object createNameService(String host, int port) throws ConfigException {
         try {
-            // create a name service using the supplied host and publish under the name "NameService"
-            TransientNameService service = new TransientNameService(host, port, "NameService");
-            // Create an ORB object
-            java.util.Properties props = new Properties();
-            props.putAll(System.getProperties());
-            props.put("org.omg.CORBA.ORBServerId", "1000000" ) ;
-            props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
-            props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
-            props.put("yoko.orb.oa.endpoint", "iiop --bind " + host  + " --host " + host + " --port " + port );
-            log.debug("Creating ORB endpoint with host=" + host + ", port=" + port);
-            ORB createdOrb = ORB.init((String[])null, props) ;
-            service.initialize(createdOrb);
+            // create a name service using the supplied host and publish under the name "NameService"            
+            TransientNameService service = new TransientNameService(host, port, "NameService") {
+                public void run() throws TransientServiceException {
+                    // Create an ORB object
+                    java.util.Properties props = new Properties();
+                    props.putAll(System.getProperties());
+
+                    props.put("org.omg.CORBA.ORBServerId", "1000000" ) ;
+                    props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
+                    props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
+                    props.put("yoko.orb.oa.endpoint", "iiop --bind " + host  + " --host " + host + " --port " + port );
+
+                    createdOrb = ORB.init((String[])null, props) ;
+
+                    // now initialize the service
+                    initialize(createdOrb);
+                }
+            };
+            service.run();
+            log.debug("Creating ORB endpoint with host=" + host + ", port=" + port);            
             // the service instance is returned as an opaque object.
             return service;
         } catch (TransientServiceException e) {