diff options
| author | Artur Signell <artur@vaadin.com> | 2015-04-16 10:10:42 +0300 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-07-21 14:41:00 +0300 |
| commit | b7f197cbaaac8c321f093c4c12c4563c549566b3 (patch) | |
| tree | cead1c0daea101fa76afa377d912e0fd51f0c1f1 /server | |
| parent | 4b121d6934bb3255bb8e3e8b981608f9ddebb0f0 (diff) | |
| download | vaadin-framework-b7f197cbaaac8c321f093c4c12c4563c549566b3.tar.gz vaadin-framework-b7f197cbaaac8c321f093c4c12c4563c549566b3.zip | |
Do not initialize Atmosphere for websocket servlet in Websphere (#16354)
Change-Id: I510df25e6034c81c16cc3b9e03a2e46850496251
Diffstat (limited to 'server')
| -rw-r--r-- | server/src/com/vaadin/server/communication/JSR356WebsocketInitializer.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/server/src/com/vaadin/server/communication/JSR356WebsocketInitializer.java b/server/src/com/vaadin/server/communication/JSR356WebsocketInitializer.java index f36d403dd5..6d2843a4fc 100644 --- a/server/src/com/vaadin/server/communication/JSR356WebsocketInitializer.java +++ b/server/src/com/vaadin/server/communication/JSR356WebsocketInitializer.java @@ -181,8 +181,13 @@ public class JSR356WebsocketInitializer implements ServletContextListener { */ 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 |