From b1a18fe1027ec34f752e67f4b21fc3c85f1e942b Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 14 Oct 2010 12:11:51 +0000
Subject: [PATCH] Avoid NPE triggered when running TCK tests

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1022478 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/coyote/http11/InternalNioOutputBuffer.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/coyote/http11/InternalNioOutputBuffer.java b/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
index 7337db429..4468b0d90 100644
--- a/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
+++ b/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
@@ -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);
     }
 
-- 
2.11.0