diff --git a/src/main/java/org/jboss/netty/util/ExecutorShutdownUtil.java b/src/main/java/org/jboss/netty/util/ExecutorShutdownUtil.java index 7eebb02a19..481c269d42 100644 --- a/src/main/java/org/jboss/netty/util/ExecutorShutdownUtil.java +++ b/src/main/java/org/jboss/netty/util/ExecutorShutdownUtil.java @@ -57,7 +57,12 @@ public class ExecutorShutdownUtil { ExecutorService es = (ExecutorService) e; for (;;) { - es.shutdownNow(); + try { + es.shutdownNow(); + } catch (NullPointerException ex) { + // Some JDK throws NPE here, but shouldn't. + } + try { if (es.awaitTermination(1, TimeUnit.SECONDS)) { break;