Author: markt
Date: Wed Mar 5 14:09:19 2014
New Revision: 1574493
URL: http://svn.apache.org/r1574493
Log:
FindBugs: Avoid NPE when flushing batched WebSocket messages.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1574493&r1=1574492&r2=1574493&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
Wed Mar 5 14:09:19 2014
@@ -234,7 +234,9 @@ public abstract class WsRemoteEndpointIm
} else {
f2sh.get(timeout, TimeUnit.MILLISECONDS);
}
- payload.clear();
+ if (payload != null) {
+ payload.clear();
+ }
} catch (InterruptedException | ExecutionException |
TimeoutException e) {
throw new IOException(e);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1574493&r1=1574492&r2=1574493&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Mar 5 14:09:19 2014
@@ -116,6 +116,9 @@
Avoid a possible deadlock when one thread is shutting down a connection
while another thread is trying to write to it. (markt)
</fix>
+ <fix>
+ Avoid NPE when flushing batched messages. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Web Applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
