svn commit: r1650535 - /tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java

[remm]

Author: remm
Date: Fri Jan  9 14:04:43 2015
New Revision: 1650535

URL: http://svn.apache.org/r1650535
Log:
Fix NPE that was swallowed.

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1650535&r1=1650534&r2=1650535&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Fri Jan  9 
14:04:43 2015
@@ -911,7 +911,7 @@ public class Nio2Endpoint extends Abstra
             super.reset(channel, soTimeout);
             upgradeInit = false;
             sendfileData = null;
-            socketWriteBuffer = channel.getBufHandler().getWriteBuffer();
+            socketWriteBuffer = (channel == null) ? null : 
channel.getBufHandler().getWriteBuffer();
         }
 
         @Override



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org