From 1971f8191fb5a3b4a17add4e91c5c548d082ee4f Mon Sep 17 00:00:00 2001
From: jfarcand <jfarcand@apache.org>
Date: Mon, 12 Mar 2012 14:38:51 -0400
Subject: [PATCH] More fix for #220 [runtime] Allow WebSocketProtocol to
 dispatch asynchronously

---
 .../java/org/atmosphere/websocket/WebSocketProcessor.java     | 4 ++--
 1 file changed, 2 insertions(+), 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
index 2f89fc9177..523752cd61 100644
--- 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