Author: remy.maucherat(a)jboss.com Date: 2014-03-11 09:49:17 -0400 (Tue, 11 Mar 2014) New Revision: 2381 Modified: branches/7.4.x/src/main/java/org/apache/catalina/connector/CoyoteOutputStream.java Log: Avoid pointless NPEs after recycle. Modified: branches/7.4.x/src/main/java/org/apache/catalina/connector/CoyoteOutputStream.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/catalina/connector/CoyoteOutputStream.java 2014-03-11 10:43:37 UTC (rev 2380) +++ branches/7.4.x/src/main/java/org/apache/catalina/connector/CoyoteOutputStream.java 2014-03-11 13:49:17 UTC (rev 2381) @@ -107,7 +107,7 @@ public boolean isReady() { - return (ob.lastWrite() > 0); + return (ob != null && ob.lastWrite() > 0); }