[jboss-cvs] JBossAS SVN: r112141 - branches/JBPAPP_5_1/cluster/src/main/org/jboss/ha/jndi.

[jboss-cvs-commits at lists.jboss.org]

Author: dereed
Date: 2011-08-26 15:01:14 -0400 (Fri, 26 Aug 2011)
New Revision: 112141

Modified:
   branches/JBPAPP_5_1/cluster/src/main/org/jboss/ha/jndi/DetachedHANamingService.java
Log:
[JBPAPP-6408] Delay creation of HA-JNDI bootstrap listener until initialization is completed


Modified: branches/JBPAPP_5_1/cluster/src/main/org/jboss/ha/jndi/DetachedHANamingService.java
===================================================================
--- branches/JBPAPP_5_1/cluster/src/main/org/jboss/ha/jndi/DetachedHANamingService.java	2011-08-26 15:44:50 UTC (rev 112140)
+++ branches/JBPAPP_5_1/cluster/src/main/org/jboss/ha/jndi/DetachedHANamingService.java	2011-08-26 19:01:14 UTC (rev 112141)
@@ -366,6 +366,10 @@
       this.log.debug("Obtaining the HAJNDI transport proxy");
       this.stub = this.getNamingProxy();
       this.distributedTreeManager.setHAStub(this.stub);
+
+      this.log.debug("initializing HAJNDI");
+      this.theServer.init();
+
       if (this.port >= 0)
       {
          this.log.debug("Starting HAJNDI bootstrap listener");
@@ -386,8 +390,6 @@
             this.log.warn("Failed to start AutomaticDiscovery", e);
          }
       }
-      this.log.debug("initializing HAJNDI");
-      this.theServer.init();
    }
 
    @Override