Author: markt Date: Mon Mar 27 09:22:08 2017 New Revision: 1788860 URL: http://svn.apache.org/viewvc?rev=1788860&view=rev Log: Improve debug logging for HPACK errors. Expose rather than swallow HpackException
Modified: tomcat/trunk/java/org/apache/coyote/http2/ConnectionException.java tomcat/trunk/java/org/apache/coyote/http2/Http2Exception.java tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java Modified: tomcat/trunk/java/org/apache/coyote/http2/ConnectionException.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/ConnectionException.java?rev=1788860&r1=1788859&r2=1788860&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/ConnectionException.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/ConnectionException.java Mon Mar 27 09:22:08 2017 @@ -26,4 +26,9 @@ class ConnectionException extends Http2E ConnectionException(String msg, Http2Error error) { super(msg, error); } + + + ConnectionException(String msg, Http2Error error, Throwable cause) { + super(msg, error, cause); + } } Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2Exception.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Exception.java?rev=1788860&r1=1788859&r2=1788860&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/Http2Exception.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/Http2Exception.java Mon Mar 27 09:22:08 2017 @@ -29,6 +29,12 @@ abstract class Http2Exception extends Ex } + Http2Exception(String msg, Http2Error error, Throwable cause) { + super(msg, cause); + this.error = error; + } + + Http2Error getError() { return error; } Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java?rev=1788860&r1=1788859&r2=1788860&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java Mon Mar 27 09:22:08 2017 @@ -420,7 +420,7 @@ class Http2Parser { } catch (HpackException hpe) { throw new ConnectionException( sm.getString("http2Parser.processFrameHeaders.decodingFailed"), - Http2Error.COMPRESSION_ERROR); + Http2Error.COMPRESSION_ERROR, hpe); } // switches to write mode --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org