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

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

Author: bstansberry at jboss.com
Date: 2007-03-13 16:06:54 -0400 (Tue, 13 Mar 2007)
New Revision: 61310

Modified:
   branches/Branch_3_2/cluster/src/main/org/jboss/ha/framework/server/HAPartitionImpl.java
Log:
[JBAS-4202] Avoid NPE if additional_data is not set

Modified: branches/Branch_3_2/cluster/src/main/org/jboss/ha/framework/server/HAPartitionImpl.java
===================================================================
--- branches/Branch_3_2/cluster/src/main/org/jboss/ha/framework/server/HAPartitionImpl.java	2007-03-13 20:02:35 UTC (rev 61309)
+++ branches/Branch_3_2/cluster/src/main/org/jboss/ha/framework/server/HAPartitionImpl.java	2007-03-13 20:06:54 UTC (rev 61310)
@@ -917,9 +917,12 @@
    {
       byte[] localUniqueName = this.localJGAddress.getAdditionalData();
       if (localUniqueName == null)
-         log.warn("No additional information has been found in the JavaGroup address: " +
+      {
+         log.warn("No additional information has been found in the JGroups address: " +
                   "make sure you are running with a correct version of JGroups and that the protocol " +
                   " you are using supports the 'additionalData' behaviour");
+         return;
+      }
 
       for (int i = 0; i < javaGroupIpAddresses.size(); i++)
       {