Author: remy.maucherat(a)jboss.com Date: 2014-01-06 13:06:29 -0500 (Mon, 06 Jan 2014) New Revision: 2334 Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java Log: JBWEB-287: Add a null check because the write event should be called even if no write was made (from the Servlet spec). Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java 2013-12-20 13:46:07 UTC (rev 2333) +++ branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java 2014-01-06 18:06:29 UTC (rev 2334) @@ -89,13 +89,15 @@ // If this is false there will be a call back when it is true while (sos.isReady()) { complete = true; - for (ByteBuffer buffer : buffers) { - if (buffer.hasRemaining()) { - complete = false; - sos.write(buffer.array(), buffer.arrayOffset(), - buffer.limit()); - buffer.position(buffer.limit()); - break; + if (buffers != null) { + for (ByteBuffer buffer : buffers) { + if (buffer.hasRemaining()) { + complete = false; + sos.write(buffer.array(), buffer.arrayOffset(), + buffer.limit()); + buffer.position(buffer.limit()); + break; + } } } if (complete) {