Author: markt
Date: Tue May 20 18:45:50 2014
New Revision: 1596363
URL: http://svn.apache.org/r1596363
Log:
Partila back-port of r1667092
Avoid possible NPE
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java?rev=1596363&r1=1596362&r2=1596363&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
Tue May 20 18:45:50 2014
@@ -157,7 +157,9 @@ public abstract class AbstractServletOut
protected final void onWritePossible() throws IOException {
try {
synchronized (writeLock) {
- writeInternal(buffer, 0, buffer.length);
+ if (buffer != null) {
+ writeInternal(buffer, 0, buffer.length);
+ }
}
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
