Author: remy.maucherat(a)jboss.com
Date: 2013-12-12 09:22:33 -0500 (Thu, 12 Dec 2013)
New Revision: 2328
Modified:
branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Log:
Port patches: Fix possible NPE on destroy. Update filter name.
Modified:
branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
===================================================================
---
branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java 2013-12-12
14:14:59 UTC (rev 2327)
+++
branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java 2013-12-12
14:22:33 UTC (rev 2328)
@@ -133,10 +133,12 @@
@Override
public void destroy() {
- try {
- connection.close();
- } catch (Exception e) {
- WebsocketsLogger.ROOT_LOGGER.destroyFailed(e);
+ if (connection != null) {
+ try {
+ connection.close();
+ } catch (Exception e) {
+ WebsocketsLogger.ROOT_LOGGER.destroyFailed(e);
+ }
}
}
Modified:
branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/WsServerContainer.java
===================================================================
---
branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/WsServerContainer.java 2013-12-12
14:14:59 UTC (rev 2327)
+++
branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/WsServerContainer.java 2013-12-12
14:22:33 UTC (rev 2328)
@@ -129,7 +129,7 @@
}
FilterRegistration.Dynamic fr = servletContext.addFilter(
- WsFilter.class.getName(), new WsFilter());
+ "Tomcat WebSocket (JSR356) Filter", new WsFilter());
fr.setAsyncSupported(true);
EnumSet<DispatcherType> types = EnumSet.of(DispatcherType.REQUEST,
Show replies by date