Author: remm
Date: Fri Nov 3 14:40:15 2017
New Revision: 1814195
URL: http://svn.apache.org/viewvc?rev=1814195&view=rev
Log:
61719: Add a null check for apparent NPE possibility (all other places ensure
the buffer is not null). Not sure if there's a worrying root cause.
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Stream.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Stream.java?rev=1814195&r1=1814194&r2=1814195&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Fri Nov 3 14:40:15
2017
@@ -916,8 +916,10 @@ class Stream extends AbstractStream impl
final void registerReadInterest() {
- synchronized (inBuffer) {
- readInterest = true;
+ if (inBuffer != null) {
+ synchronized (inBuffer) {
+ readInterest = true;
+ }
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1814195&r1=1814194&r2=1814195&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Nov 3 14:40:15 2017
@@ -87,6 +87,10 @@
Reduce default HTTP/2 stream concurrent execution within a connection
from 200 to 20. (remm)
</fix>
+ <fix>
+ <bug>61719</bug>: Avoid possible NPE calling
+ InputStream.setReadListener with HTTP/2. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
