Merge pull request #1684 from mvsmasiero/master

Reverting changes from fix #1670
Atmosphere · Jul 30, 2014 · 2439183 · 2439183
2 parents 0f39eae + e65f081
commit 2439183
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/modules/cpr/src/main/java/org/atmosphere/container/JBossWebSocketSupport.java b/modules/cpr/src/main/java/org/atmosphere/container/JBossWebSocketSupport.java
@@ -37,7 +37,7 @@
  * @author Péter Miklós
  * @see https://github.com/mikebrock/jboss-websockets
  */
-public class JBossWebSocketSupport extends JBossWebCometSupport {
+public class JBossWebSocketSupport extends AsynchronousProcessor {
 
 
     private static final Logger logger = LoggerFactory.getLogger(JBossWebSocketSupport.class);
@@ -65,11 +65,22 @@ private HttpEventServlet newWebSocketHandler(AtmosphereConfig config) {
         return null;
     }
 
+    @Override
+    public Action service(AtmosphereRequest req, AtmosphereResponse res) throws IOException, ServletException {
+        return suspended(req, res);
+    }
+
     @Override
     public boolean supportWebSocket() {
         return true;
     }
 
+    @Override
+    public AsyncSupport complete(AtmosphereResourceImpl r) {
+        // TODO: How can this be fixed.
+        return this;
+    }
+
     /**
      * @param httpEvent
      * @throws javax.servlet.ServletException