[jboss-cvs] JBossAS SVN: r69143 - branches/Branch_4_2/cluster/src/main/org/jboss/ha/framework/server.

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

Author: bstansberry at jboss.com
Date: 2008-01-19 21:37:29 -0500 (Sat, 19 Jan 2008)
New Revision: 69143

Modified:
   branches/Branch_4_2/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java
Log:
[JBAS-5068] Prevent NPE when events arrive before handler created

Modified: branches/Branch_4_2/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java
===================================================================
--- branches/Branch_4_2/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java	2008-01-20 00:18:08 UTC (rev 69142)
+++ branches/Branch_4_2/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java	2008-01-20 02:37:29 UTC (rev 69143)
@@ -104,12 +104,14 @@
       this.mbeanserver = server;
       this.log = Logger.getLogger(DistributedReplicantManagerImpl.class.getName() + "." + partition.getPartitionName());
       this.trace = log.isTraceEnabled();
+      // JBAS-5068 Create the handler early so we don't risk NPEs
+      this.asynchHandler = new AsynchEventHandler(this, "AsynchKeyChangeHandler");
    }
 
    // Public --------------------------------------------------------
    
    public void init() throws Exception
-   {
+   {  
       log.debug("registerRPCHandler");
       partition.registerRPCHandler(SERVICE_NAME, this);
       log.debug("subscribeToStateTransferEvents");
@@ -131,9 +133,7 @@
    public void start() throws Exception
    {
       this.nodeName = this.partition.getNodeName ();
-      
-      // Create the asynch listener handler thread
-      asynchHandler = new AsynchEventHandler(this, "AsynchKeyChangeHandler");
+            
       asynchHandler.start();
 
       partitionNameKnown.release (); // partition name is now known!