Author: markt
Date: Mon Nov 23 22:19:30 2015
New Revision: 1715981
URL: http://svn.apache.org/viewvc?rev=1715981&view=rev
Log:
Fix warnings
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1715981&r1=1715980&r2=1715981&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
Mon Nov 23 22:19:30 2015
@@ -342,7 +342,9 @@ public class WsWebSocketContainer
}
} catch (TimeoutException | InterruptedException |
ExecutionException |
EOFException e) {
- channel.close();
+ if (channel != null) {
+ channel.close();
+ }
throw new DeploymentException(
sm.getString("wsWebSocketContainer.httpRequestFailed"), e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
