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 2014/04/04 23:36:41 UTC
svn commit: r1584922 - in /tomcat/trunk:
java/org/apache/tomcat/websocket/WsWebSocketContainer.java
webapps/docs/changelog.xml
Author: markt
Date: Fri Apr 4 21:36:41 2014
New Revision: 1584922
URL: http://svn.apache.org/r1584922
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56343
Avoid NPE if WebSocket API JAR from RI is used.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1584922&r1=1584921&r2=1584922&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Fri Apr 4 21:36:41 2014
@@ -190,8 +190,12 @@ public class WsWebSocketContainer
}
}
- ClientEndpointConfig config = ClientEndpointConfig.Builder.create().
- configurator(configurator).
+ ClientEndpointConfig.Builder builder = ClientEndpointConfig.Builder.create();
+ // Avoid NPE when using RI API JAR - see BZ 56343
+ if (configurator != null) {
+ builder.configurator(configurator);
+ }
+ ClientEndpointConfig config = builder.
decoders(Arrays.asList(annotation.decoders())).
encoders(Arrays.asList(annotation.encoders())).
build();
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1584922&r1=1584921&r2=1584922&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Apr 4 21:36:41 2014
@@ -138,6 +138,15 @@
</fix>
</changelog>
</subsection>
+ <subsection name="WebSocket">
+ <changelog>
+ <fix>
+ <bug>56343</bug>: Avoid a NPE if Tomcat's Java WebSocket 1.0
+ implementation is used with the Java WebSocket 1.0 API JAR from the
+ reference implementation. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Web applications">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org