You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/12/12 23:10:57 UTC
svn commit: r1719744 -
/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
Author: markt
Date: Sat Dec 12 22:10:57 2015
New Revision: 1719744
URL: http://svn.apache.org/viewvc?rev=1719744&view=rev
Log:
Avoid NPE causing failure in TestWsSubprotocols
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1719744&r1=1719743&r2=1719744&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java Sat Dec 12 22:10:57 2015
@@ -539,7 +539,7 @@ public abstract class WsRemoteEndpointIm
private void handleSendFailureWithEncode(Throwable t) throws IOException, EncodeException {
// First, unwrap any execution exception
- if (t instanceof ExecutionException) {
+ if (t instanceof ExecutionException && t.getCause() != null) {
t = t.getCause();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org