Author: markt
Date: Sat Nov 24 18:47:54 2012
New Revision: 1413236
URL: http://svn.apache.org/viewvc?rev=1413236&view=rev
Log:
Fix NPE when in blocking mode
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletInputStream.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletInputStream.java?rev=1413236&r1=1413235&r2=1413236&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletInputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletInputStream.java
Sat Nov 24 18:47:54 2012
@@ -101,7 +101,7 @@ public abstract class UpgradeServletInpu
private void preReadChecks() {
- if (ready == null || !ready.booleanValue()) {
+ if (listener != null && (ready == null || !ready.booleanValue())) {
// TODO i18n
throw new IllegalStateException();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
