Author: remy.maucherat(a)jboss.com Date: 2014-11-14 05:20:21 -0500 (Fri, 14 Nov 2014) New Revision: 2539 Modified: branches/7.5.x/src/main/java/org/apache/catalina/connector/CoyoteOutputStream.java Log: Same as r2381, avoid NPE after recycle. Modified: branches/7.5.x/src/main/java/org/apache/catalina/connector/CoyoteOutputStream.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/catalina/connector/CoyoteOutputStream.java 2014-11-13 17:57:45 UTC (rev 2538) +++ branches/7.5.x/src/main/java/org/apache/catalina/connector/CoyoteOutputStream.java 2014-11-14 10:20:21 UTC (rev 2539) @@ -102,7 +102,9 @@ public void close() throws IOException { - ob.close(); + if (ob != null) { + ob.close(); + } }