Properly handle a null jgroups channel address.

This can happen when jgroups is in the process of shutting down.
projectodd · Mar 17, 2015 · 999bb14 · 999bb14
1 parent 3dff330
commit 999bb14
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/.../wildfly/src/main/java/org/projectodd/wunderboss/wildfly/SingletonClusterParticipant.java b/.../wildfly/src/main/java/org/projectodd/wunderboss/wildfly/SingletonClusterParticipant.java
@@ -88,7 +88,10 @@ public Address id() {
     }
 
     public boolean isMasterWithoutInterrogatingCluster() {
-        return id().equals(this.currentMaster);
+        final Address id = id();
+
+        return id != null &&
+                id.equals(this.currentMaster);
     }
 
     @Override
@@ -124,7 +127,7 @@ public boolean isMaster() {
                     if (this.currentMaster != null) {
                         //I don't think we can become master while someone else holds the lock, but...
                         isMaster = isMasterWithoutInterrogatingCluster();
-                    } else {
+                    } else if (id() != null) { // id() will be null if jgroups is shut/shutting down
                         Map<String, Object> msg = new HashMap();
                         msg.put("dispatch", this.name);
                         msg.put("payload", id());