Author: markt
Date: Sat May 14 21:27:38 2011
New Revision: 1103228
URL: http://svn.apache.org/viewvc?rev=1103228&view=rev
Log:
Avoid NPE is lastWrite is not being used
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java?rev=1103228&r1=1103227&r2=1103228&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java Sat
May 14 21:27:38 2011
@@ -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;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
