Author: remm
Date: Thu Feb 1 11:17:17 2018
New Revision: 1822867
URL: http://svn.apache.org/viewvc?rev=1822867&view=rev
Log:
62053: Fix NPE when writing push headers with HTTP/2 NIO2. Patch submitted by
Holger Sunke.
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java?rev=1822867&r1=1822866&r2=1822867&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java Thu
Feb 1 11:17:17 2018
@@ -155,7 +155,9 @@ public class Http2AsyncUpgradeHandler ex
synchronized (socketWrapper) {
AsyncHeaderFrameBuffers headerFrameBuffers =
(AsyncHeaderFrameBuffers)
doWriteHeaders(stream, pushedStreamId, mimeHeaders,
endOfStream, payloadSize);
- bufs = headerFrameBuffers.bufs.toArray(BYTEBUFFER_ARRAY);
+ if (headerFrameBuffers != null) {
+ bufs = headerFrameBuffers.bufs.toArray(BYTEBUFFER_ARRAY);
+ }
}
if (bufs != null) {
socketWrapper.write(BlockingMode.SEMI_BLOCK,
protocol.getWriteTimeout(),
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1822867&r1=1822866&r2=1822867&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Feb 1 11:17:17 2018
@@ -135,6 +135,10 @@
names (excluding top-level domains) to start with a number and to
ensure
that top-level domains are fully alphabetic. (markt)
</fix>
+ <fix>
+ <bug>62053</bug>: Fix NPE when writing push headers with HTTP/2 NIO2.
+ Patch submitted by Holger Sunke. (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
