Author: violetagg
Date: Tue Dec 10 17:54:52 2013
New Revision: 1549909
URL: http://svn.apache.org/r1549909
Log:
In o.a.tomcat.websocket.server.WsHttpUpgradeHandler.init(WebConnection) if the
endpoint is NULL the connection will not be initialized.
Then in o.a.tomcat.websocket.server.WsHttpUpgradeHandler.destroy() the
connection should be tested for NULL.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java?rev=1549909&r1=1549908&r2=1549909&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
Tue Dec 10 17:54:52 2013
@@ -139,10 +139,12 @@ public class WsHttpUpgradeHandler implem
@Override
public void destroy() {
- try {
- connection.close();
- } catch (Exception e) {
- log.error(sm.getString("wsHttpUpgradeHandler.destroyFailed"), e);
+ if (connection != null) {
+ try {
+ connection.close();
+ } catch (Exception e) {
+ log.error(sm.getString("wsHttpUpgradeHandler.destroyFailed"),
e);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
