Do not initialize Atmosphere for websocket servlet in Websphere (#16354)

Change-Id: I6f32668d357c2f2af75a2d53de37708f6c449b44
vaadin · Jul 14, 2015 · ed02ddb · ed02ddb
1 parent dc4946d
commit ed02ddb
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/server/src/com/vaadin/server/communication/JSR356WebsocketInitializer.java b/server/src/com/vaadin/server/communication/JSR356WebsocketInitializer.java
@@ -181,8 +181,13 @@ public static String getAttributeName(String servletName) {
      */
     protected boolean isVaadinServlet(ServletRegistration servletRegistration) {
         try {
-            Class<?> servletClass = Class.forName(servletRegistration
-                    .getClassName());
+            String servletClassName = servletRegistration.getClassName();
+            if (servletClassName.equals("com.ibm.ws.wsoc.WsocServlet")) {
+                // Websphere servlet which implements websocket endpoints,
+                // dynamically added
+                return false;
+            }
+            Class<?> servletClass = Class.forName(servletClassName);
             return VaadinServlet.class.isAssignableFrom(servletClass);
         } catch (Exception e) {
             // This will fail in OSGi environments, assume everything is a