More fix for #220 [runtime] Allow WebSocketProtocol to dispatch async…

…hronously
Atmosphere · Mar 12, 2012 · 1971f81 · 1971f81
1 parent ba7d4af
commit 1971f81
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/modules/cpr/src/main/java/org/atmosphere/websocket/WebSocketProcessor.java b/modules/cpr/src/main/java/org/atmosphere/websocket/WebSocketProcessor.java
@@ -76,11 +76,10 @@ public WebSocketProcessor(AtmosphereFramework framework, WebSocket webSocket, We
         s = framework.getAtmosphereConfig().getInitParameter(ApplicationConfig.WEBSOCKET_PROTOCOL_EXECUTION);
         if (s != null && Boolean.valueOf(s)) {
             executeAsync = true;
-            asyncExecutor = Executors.newCachedThreadPool();
         } else {
             executeAsync = false;
-            asyncExecutor = VoidExecutorService.VOID;
         }
+        asyncExecutor = Executors.newCachedThreadPool();
     }
 
     public final void dispatch(final AtmosphereRequest request) throws IOException {
@@ -233,6 +232,7 @@ public void close(int closeCode) {
                 WebSocketAdapter.class.cast(webSocket).setAtmosphereResource(null);
             }
         }
+        asyncExecutor.shutdownNow();
     }
 
     @Override