Author: remm
Date: Fri Feb 27 15:53:48 2015
New Revision: 1662731
URL: http://svn.apache.org/r1662731
Log:
Restore NPE check as I got a NPE on:
org.apache.tomcat.websocket.server.WsRemoteEndpointImplServer.onWritePossible(WsRemoteEndpointImplServer.java:125)
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java?rev=1662731&r1=1662730&r2=1662731&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Fri Feb 27 15:53:48 2015
@@ -116,6 +116,11 @@ public class WsRemoteEndpointImplServer
public void onWritePossible(boolean useDispatch) {
ByteBuffer[] buffers = this.buffers;
+ if (buffers == null) {
+ // Servlet 3.1 will call the write listener once even if nothing
+ // was written
+ return;
+ }
boolean complete = false;
try {
socketWrapper.flush(false);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
