Avoid NPE triggered when running TCK tests
authormarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Thu, 14 Oct 2010 12:11:51 +0000 (12:11 +0000)
committermarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Thu, 14 Oct 2010 12:11:51 +0000 (12:11 +0000)
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1022478 13f79535-47bb-0310-9956-ffa450edef68

java/org/apache/coyote/http11/InternalNioOutputBuffer.java

index 7337db4..4468b0d 100644 (file)
@@ -144,8 +144,10 @@ public class InternalNioOutputBuffer extends AbstractOutputBuffer {
     @Override
     public void recycle() {
         super.recycle();
-        socket.getBufHandler().getWriteBuffer().clear();
-        socket = null;
+        if (socket != null) {
+            socket.getBufHandler().getWriteBuffer().clear();
+            socket = null;
+        }
         lastWrite.set(1);
     }