From ab2bbc82a692d1cd7e897ce10a85ab98c48619f7 Mon Sep 17 00:00:00 2001 From: markt Date: Sat, 14 May 2011 21:27:38 +0000 Subject: [PATCH] Avoid NPE is lastWrite is not being used git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1103228 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/tomcat/util/net/NioBlockingSelector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/org/apache/tomcat/util/net/NioBlockingSelector.java b/java/org/apache/tomcat/util/net/NioBlockingSelector.java index 192120b1b..cc0b1d84d 100644 --- a/java/org/apache/tomcat/util/net/NioBlockingSelector.java +++ b/java/org/apache/tomcat/util/net/NioBlockingSelector.java @@ -92,7 +92,7 @@ public class NioBlockingSelector { while ( (!timedout) && buf.hasRemaining()) { if (keycount > 0) { //only write if we were registered for a write int cnt = socket.write(buf); //write the data - lastWrite.set(cnt); + if (lastWrite != null) lastWrite.set(cnt); if (cnt == -1) throw new EOFException(); written += cnt; -- 2.11.0