From 3a4090878355487d2958805690af0090ce9b81cb Mon Sep 17 00:00:00 2001
From: Edward Capriolo <edlinuxguru@gmail.com>
Date: Wed, 30 Mar 2016 21:21:19 -0400
Subject: [PATCH] Possible NPE

---
 .../java/com/google/code/gossip/manager/GossipManager.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/google/code/gossip/manager/GossipManager.java b/src/main/java/com/google/code/gossip/manager/GossipManager.java
index 57c0f6d..136f81d 100644
--- a/src/main/java/com/google/code/gossip/manager/GossipManager.java
+++ b/src/main/java/com/google/code/gossip/manager/GossipManager.java
@@ -57,7 +57,7 @@ public abstract class GossipManager extends Thread implements NotificationListen
         GossipService.LOGGER.debug(member);
       }
     }
-
+    _gossipThreadExecutor = Executors.newCachedThreadPool();
     _gossipServiceRunning = new AtomicBoolean(true);
     this.listener = listener;
     Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
@@ -143,7 +143,6 @@ public abstract class GossipManager extends Thread implements NotificationListen
         member.startTimeoutTimer();
       }
     }
-    _gossipThreadExecutor = Executors.newCachedThreadPool();
     try {
       passiveGossipThread = _passiveGossipThreadClass.getConstructor(GossipManager.class)
               .newInstance(this);
@@ -170,6 +169,7 @@ public abstract class GossipManager extends Thread implements NotificationListen
    * Shutdown the gossip service.
    */
   public void shutdown() {
+    _gossipServiceRunning.set(false);
     _gossipThreadExecutor.shutdown();
     passiveGossipThread.shutdown();
     activeGossipThread.shutdown();
@@ -181,6 +181,5 @@ public abstract class GossipManager extends Thread implements NotificationListen
     } catch (InterruptedException e) {
       LOGGER.error(e);
     }
-    _gossipServiceRunning.set(false);
   }
 }