[jbossweb-commits] JBossWeb SVN: r2375 - branches/7.4.x/src/main/java/org/apache/tomcat/websocket.
Author: remy.maucherat(a)jboss.com
Date: 2014-03-05 09:58:51 -0500 (Wed, 05 Mar 2014)
New Revision: 2375
Modified:
branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
Log:
Port fix: possible NPE with batch.
Modified:
branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
===================================================================
---
branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 2014-03-03
16:21:50 UTC (rev 2374)
+++
branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 2014-03-05
14:58:51 UTC (rev 2375)
@@ -232,7 +232,9 @@
} else {
f2sh.get(timeout, TimeUnit.MILLISECONDS);
}
- payload.clear();
+ if (payload != null) {
+ payload.clear();
+ }
} catch (InterruptedException e) {
throw new IOException(e);
} catch (ExecutionException e) {