geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r615302 - in /geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb: CosNaming/tnaming/TransientNameService.java OBPortableServer/POAManagerFactory_impl.java OBPortableServer/POA_impl.java OCI/IIOP/AccFactory_impl.java
Date Fri, 25 Jan 2008 18:37:39 GMT
Author: rickmcguire
Date: Fri Jan 25 10:37:38 2008
New Revision: 615302

URL: http://svn.apache.org/viewvc?rev=615302&view=rev
Log:
GERONIMO-3773 hostname lookup causes long startup time when offline

Set configuration to avoid DNS timeout issues when namingservice is launched. 


Modified:
    geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CosNaming/tnaming/TransientNameService.java
    geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OBPortableServer/POAManagerFactory_impl.java
    geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OBPortableServer/POA_impl.java
    geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/AccFactory_impl.java

Modified: geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CosNaming/tnaming/TransientNameService.java
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CosNaming/tnaming/TransientNameService.java?rev=615302&r1=615301&r2=615302&view=diff
==============================================================================
--- geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CosNaming/tnaming/TransientNameService.java
(original)
+++ geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CosNaming/tnaming/TransientNameService.java
Fri Jan 25 10:37:38 2008
@@ -108,6 +108,7 @@
         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 --host " + host + " --port " + port);
+        props.put("yoko.orb.poamanager.TNameService.endpoint", "iiop --host " + host);
 
 	    createdOrb = ORB.init((String[])null, props) ;
 
@@ -128,6 +129,10 @@
             // get the root POA.  We're going to re
             POA rootPOA = (POA) orb.resolve_initial_references("RootPOA");
             rootPOA.the_POAManager().activate();
+            
+            org.omg.PortableServer.POAManagerFactory factory = rootPOA.the_POAManagerFactory();
+            org.apache.yoko.orb.OBPortableServer.POAManagerFactory pmFactory = org.apache.yoko.orb.OBPortableServer.POAManagerFactoryHelper
+                    .narrow(factory);
 
             // we need to create a POA to manage this named instance, and then activate
             // a context on it.

Modified: geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OBPortableServer/POAManagerFactory_impl.java
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OBPortableServer/POAManagerFactory_impl.java?rev=615302&r1=615301&r2=615302&view=diff
==============================================================================
--- geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OBPortableServer/POAManagerFactory_impl.java
(original)
+++ geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OBPortableServer/POAManagerFactory_impl.java
Fri Jan 25 10:37:38 2008
@@ -224,6 +224,7 @@
                     rootStr = props.getProperty("yoko.orb.oa.endpoint");
                 String propName = "yoko.orb.poamanager." + id + ".endpoint";
                 paramStr = props.getProperty(propName);
+                
                 if (paramStr == null && rootStr == null)
                     paramStr = "iiop";
                 else if (paramStr == null)

Modified: geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OBPortableServer/POA_impl.java
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OBPortableServer/POA_impl.java?rev=615302&r1=615301&r2=615302&view=diff
==============================================================================
--- geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OBPortableServer/POA_impl.java
(original)
+++ geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OBPortableServer/POA_impl.java
Fri Jan 25 10:37:38 2008
@@ -670,7 +670,7 @@
                                     .resolveInitialReferences("POAManagerFactory"));
                     org.omg.CORBA.Policy[] emptyPl = new org.omg.CORBA.Policy[0];
                     obmanager = (org.apache.yoko.orb.OBPortableServer.POAManager) factory
-                            .create_POAManager("", emptyPl);
+                            .create_POAManager(adapter, emptyPl);
                 } catch (org.omg.CORBA.ORBPackage.InvalidName ex) {
                     org.apache.yoko.orb.OB.Assert._OB_assert(ex);
                 } catch (org.omg.PortableServer.POAManagerFactoryPackage.ManagerAlreadyExists
ex) {

Modified: geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/AccFactory_impl.java
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/AccFactory_impl.java?rev=615302&r1=615301&r2=615302&view=diff
==============================================================================
--- geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/AccFactory_impl.java
(original)
+++ geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/AccFactory_impl.java
Fri Jan 25 10:37:38 2008
@@ -63,7 +63,7 @@
         int port = 0;
         int backlog = 0;
         boolean numeric = false;
-
+        
         int i = 0;
         while (i < params.length) {
             if (params[i].equals("--backlog")) {



Mime
View raw message