Fixed null pointer exception in ServerConnection

This commit is contained in:
Josh Larson
2016-02-05 19:20:04 -06:00
parent a066647f89
commit 00f8cb342c

View File

@@ -74,8 +74,10 @@ public class ServerConnection {
if (callbackExecutor != null)
callbackExecutor.shutdownNow();
try {
processor.awaitTermination(1, TimeUnit.MINUTES);
callbackExecutor.awaitTermination(1, TimeUnit.MINUTES);
if (processor != null)
processor.awaitTermination(1, TimeUnit.MINUTES);
if (callbackExecutor != null)
callbackExecutor.awaitTermination(1, TimeUnit.MINUTES);
} catch (InterruptedException e) {
}