Author: remm Date: Fri Jun 27 23:50:46 2014 New Revision: 1606271 URL: http://svn.apache.org/r1606271 Log: Add back the NPE check for now since the testsuite confirms it with all connectors. http://ci.apache.org/builders/tomcat-trunk/builds/224/steps/compile_1/logs/stdio
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 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=1606271&r1=1606270&r2=1606271&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java Fri Jun 27 23:50:46 2014 @@ -260,7 +260,9 @@ public abstract class WsRemoteEndpointIm messageParts.add(new MessagePart(opCode, payload, last, new EndMessageHandler(this, handler))); - messageParts = transformation.sendMessagePart(messageParts); + if (transformation != null) { + messageParts = transformation.sendMessagePart(messageParts); + } MessagePart mp = messageParts.remove(0); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org