Browse Source

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

Change-Id: I6f32668d357c2f2af75a2d53de37708f6c449b44
tags/7.6.0.alpha3^2
Artur Signell 9 years ago
parent
commit
ed02ddb86e

+ 7
- 2
server/src/com/vaadin/server/communication/JSR356WebsocketInitializer.java View File

*/ */
protected boolean isVaadinServlet(ServletRegistration servletRegistration) { protected boolean isVaadinServlet(ServletRegistration servletRegistration) {
try { 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); return VaadinServlet.class.isAssignableFrom(servletClass);
} catch (Exception e) { } catch (Exception e) {
// This will fail in OSGi environments, assume everything is a // This will fail in OSGi environments, assume everything is a

Loading…
Cancel
Save