rdev/gossip-revisited
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #20 from edwardcapriolo/why-null

Browse Source 
Why set to null
This commit is contained in:
edwardcapriolo
2016-04-20 14:06:31 -04:30
parent 611b53b475 abbb088d76
commit fee57b2ad6
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/google/code/gossip/manager/GossipManager.java
View File

@ -188,8 +188,12 @@ public abstract class GossipManager extends Thread implements NotificationListen
public void shutdown() { public void shutdown() {
_gossipServiceRunning.set(false); _gossipServiceRunning.set(false);
_gossipThreadExecutor.shutdown(); _gossipThreadExecutor.shutdown();
passiveGossipThread.shutdown(); if (passiveGossipThread != null){
activeGossipThread.shutdown(); passiveGossipThread.shutdown();
}
if (activeGossipThread != null){
activeGossipThread.shutdown();
}
try { try {
boolean result = _gossipThreadExecutor.awaitTermination(1000, TimeUnit.MILLISECONDS); boolean result = _gossipThreadExecutor.awaitTermination(1000, TimeUnit.MILLISECONDS);
if (!result){ if (!result){

3
src/main/java/com/google/code/gossip/manager/PassiveGossipThread.java
View File

@ -64,7 +64,6 @@ abstract public class PassiveGossipThread implements Runnable {
GossipService.LOGGER.debug("I am " + _gossipManager.getMyself()); GossipService.LOGGER.debug("I am " + _gossipManager.getMyself());
} catch (SocketException ex) { } catch (SocketException ex) {
GossipService.LOGGER.warn(ex); GossipService.LOGGER.warn(ex);
_server = null;
throw new RuntimeException(ex); throw new RuntimeException(ex);
} }
_keepRunning = new AtomicBoolean(true); _keepRunning = new AtomicBoolean(true);
@ -139,7 +138,9 @@ abstract public class PassiveGossipThread implements Runnable {
} }
public void shutdown() { public void shutdown() {
try {
_server.close(); _server.close();
} catch (RuntimeException ex){ }
} }
/** /**