Author: remm
Date: Fri Jan 9 17:31:41 2015
New Revision: 1650606
URL: http://svn.apache.org/r1650606
Log:
Port fix from NIO2.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1650606&r1=1650605&r2=1650606&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Fri Jan 9
17:31:41 2015
@@ -1339,8 +1339,8 @@ public class NioEndpoint extends Abstrac
}
writeLatch = null;
setWriteTimeout(soTimeout);
-
- socketWriteBuffer = channel.getBufHandler().getWriteBuffer();
+ // Channel will be null when socket is being closed.
+ socketWriteBuffer = (channel == null) ? null :
channel.getBufHandler().getWriteBuffer();
}
public void reset() {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
