Author: violetagg
Date: Tue Dec 10 18:21:28 2013
New Revision: 1549918
URL: http://svn.apache.org/r1549918
Log:
Merged revision 1549909 from tomcat/trunk:
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/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1549909
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java?rev=1549918&r1=1549917&r2=1549918&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
Tue Dec 10 18:21:28 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);
+ }
}
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1549918&r1=1549917&r2=1549918&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Dec 10 18:21:28 2013
@@ -58,8 +58,14 @@
<section name="Tomcat 7.0.49 (violetagg)">
<subsection name="Catalina">
<changelog>
- Correct a regression in the new XML local resolver that triggered false
- failures when XML validation was configured. (markt)
+ <fix>
+ Correct a regression in the new XML local resolver that triggered false
+ failures when XML validation was configured. (markt)
+ </fix>
+ <fix>
+ Prevent a NPE when destroying HTTP upgrade handler for WebSocket
+ connections. (violetagg)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
