GEODE-2497: surprise members are never timed out during startup

fixed NPE caused by previous fix
maduhu · Feb 24, 2017 · 42f733f · 42f733f
1 parent 86550db
commit 42f733f
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/...n/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java b/...n/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
@@ -977,11 +977,10 @@ public void run() {
 
   /** starts periodic task to perform cleanup chores such as expire surprise members */
   private void startCleanupTimer() {
-    if (this.dcReceiver == null) {
-      // junit tests don't provide a direct-channel receiver
+    if (this.listener == null || listener.getDM() == null) {
       return;
     }
-    DistributedSystem ds = this.dcReceiver.getDM().getSystem();
+    DistributedSystem ds = this.listener.getDM().getSystem();
     this.cleanupTimer = new SystemTimer(ds, true);
     SystemTimer.SystemTimerTask st = new SystemTimer.SystemTimerTask() {
       @Override