Author: markt Date: Mon Jun 8 19:51:30 2015 New Revision: 1684258 URL: http://svn.apache.org/r1684258 Log: Remove stream ID from Http2Exception (simpler logging of this to follow)
Modified: tomcat/trunk/java/org/apache/coyote/http2/ConnectionError.java tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java tomcat/trunk/java/org/apache/coyote/http2/FrameType.java tomcat/trunk/java/org/apache/coyote/http2/Http2Exception.java tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java tomcat/trunk/java/org/apache/coyote/http2/StreamError.java tomcat/trunk/java/org/apache/coyote/http2/StreamStateMachine.java tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java Modified: tomcat/trunk/java/org/apache/coyote/http2/ConnectionError.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/ConnectionError.java?rev=1684258&r1=1684257&r2=1684258&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/ConnectionError.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/ConnectionError.java Mon Jun 8 19:51:30 2015 @@ -20,7 +20,7 @@ public class ConnectionError extends Htt private static final long serialVersionUID = 1L; - public ConnectionError(String msg, int streamId, Error error) { - super(msg, streamId, error); + public ConnectionError(String msg, Error error) { + super(msg, error); } } Modified: tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java?rev=1684258&r1=1684257&r2=1684258&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java Mon Jun 8 19:51:30 2015 @@ -16,8 +16,6 @@ */ package org.apache.coyote.http2; -import java.io.IOException; - import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.res.StringManager; @@ -44,7 +42,7 @@ public class ConnectionSettings { private volatile int maxFrameSize = DEFAULT_MAX_FRAME_SIZE; private volatile long maxHeaderListSize = UNLIMITED; - public void set(int parameterId, long value) throws IOException { + public void set(int parameterId, long value) throws ConnectionError { if (log.isDebugEnabled()) { log.debug(sm.getString("connectionSettings.debug", Integer.toString(parameterId), Long.toString(value))); @@ -80,11 +78,11 @@ public class ConnectionSettings { public int getHeaderTableSize() { return headerTableSize; } - public void setHeaderTableSize(long headerTableSize) throws IOException { + public void setHeaderTableSize(long headerTableSize) throws ConnectionError { // Need to put a sensible limit on this. Start with 16k (default is 4k) if (headerTableSize > (16 * 1024)) { throw new ConnectionError(sm.getString("connectionSettings.headerTableSizeLimit", - Long.toString(headerTableSize)), 0, Error.PROTOCOL_ERROR); + Long.toString(headerTableSize)), Error.PROTOCOL_ERROR); } this.headerTableSize = (int) headerTableSize; } @@ -93,12 +91,12 @@ public class ConnectionSettings { public boolean getEnablePush() { return enablePush; } - public void setEnablePush(long enablePush) throws IOException { + public void setEnablePush(long enablePush) throws ConnectionError { // Can't be less than zero since the result of the byte->long conversion // will never be negative if (enablePush > 1) { throw new ConnectionError(sm.getString("connectionSettings.enablePushInvalid", - Long.toString(enablePush)), 0, Error.PROTOCOL_ERROR); + Long.toString(enablePush)), Error.PROTOCOL_ERROR); } this.enablePush = (enablePush == 1); } @@ -115,11 +113,11 @@ public class ConnectionSettings { public int getInitialWindowSize() { return initialWindowSize; } - public void setInitialWindowSize(long initialWindowSize) throws IOException { + public void setInitialWindowSize(long initialWindowSize) throws ConnectionError { if (initialWindowSize > MAX_WINDOW_SIZE) { throw new ConnectionError(sm.getString("connectionSettings.windowSizeTooBig", Long.toString(initialWindowSize), Long.toString(MAX_WINDOW_SIZE)), - 0, Error.PROTOCOL_ERROR); + Error.PROTOCOL_ERROR); } this.initialWindowSize = (int) initialWindowSize; } @@ -128,11 +126,11 @@ public class ConnectionSettings { public int getMaxFrameSize() { return maxFrameSize; } - public void setMaxFrameSize(long maxFrameSize) throws IOException { + public void setMaxFrameSize(long maxFrameSize) throws ConnectionError { if (maxFrameSize < MIN_MAX_FRAME_SIZE || maxFrameSize > MAX_MAX_FRAME_SIZE) { throw new ConnectionError(sm.getString("connectionSettings.maxFrameSizeInvalid", Long.toString(maxFrameSize), Integer.toString(MIN_MAX_FRAME_SIZE), - Integer.toString(MAX_MAX_FRAME_SIZE)), 0, Error.PROTOCOL_ERROR); + Integer.toString(MAX_MAX_FRAME_SIZE)), Error.PROTOCOL_ERROR); } this.maxFrameSize = (int) maxFrameSize; } Modified: tomcat/trunk/java/org/apache/coyote/http2/FrameType.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/FrameType.java?rev=1684258&r1=1684257&r2=1684258&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/FrameType.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/FrameType.java Mon Jun 8 19:51:30 2015 @@ -59,10 +59,10 @@ public enum FrameType { public void checkStream(String connectionId, int streamId) throws Http2Exception { if (streamId == 0 && !streamZero) { throw new ConnectionError(sm.getString("frameType.checkStream.invalidForZero", - connectionId, this), 0, Error.PROTOCOL_ERROR); + connectionId, this), Error.PROTOCOL_ERROR); } else if (streamId != 0 && !streamNonZero) { throw new ConnectionError(sm.getString("frameType.checkStream.invalidForNonZero", - connectionId, Integer.valueOf(streamId), this), 0, Error.PROTOCOL_ERROR); + connectionId, Integer.valueOf(streamId), this), Error.PROTOCOL_ERROR); } } @@ -72,7 +72,7 @@ public enum FrameType { if (payloadSizeValidator != null && !payloadSizeValidator.test(payloadSize)) { throw new ConnectionError(sm.getString("frameType.checkPayloadSize", connectionId, Integer.toString(streamId), this, Integer.toString(payloadSize)), - 0, Error.FRAME_SIZE_ERROR); + Error.FRAME_SIZE_ERROR); } } 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=1684258&r1=1684257&r2=1684258&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/Http2Exception.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/Http2Exception.java Mon Jun 8 19:51:30 2015 @@ -20,22 +20,15 @@ public abstract class Http2Exception ext private static final long serialVersionUID = 1L; - private final int streamId; private final Error error; - public Http2Exception(String msg, int streamId, Error error) { + public Http2Exception(String msg, Error error) { super(msg); - this.streamId = streamId; this.error = error; } - public int getStreamId() { - return streamId; - } - - public Error 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=1684258&r1=1684257&r2=1684258&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java Mon Jun 8 19:51:30 2015 @@ -245,7 +245,7 @@ class Http2Parser { if (payloadSize > 0 && ack) { throw new ConnectionError(sm.getString( "http2Parser.processFrameSettings.ackWithNonZeroPayload"), - 0, Error.FRAME_SIZE_ERROR); + Error.FRAME_SIZE_ERROR); } if (payloadSize != 0) { @@ -264,7 +264,7 @@ class Http2Parser { private void readPushPromiseFrame(int streamId) throws Http2Exception { throw new ConnectionError(sm.getString("http2Parser.processFramePushPromise", - connectionId, Integer.valueOf(streamId)), 0, Error.PROTOCOL_ERROR); + connectionId, Integer.valueOf(streamId)), Error.PROTOCOL_ERROR); } @@ -309,11 +309,11 @@ class Http2Parser { if (streamId == 0) { throw new ConnectionError( sm.getString("http2Parser.processFrameWindowUpdate.invalidIncrement"), - 0, Error.PROTOCOL_ERROR); + Error.PROTOCOL_ERROR); } else { throw new StreamError( sm.getString("http2Parser.processFrameWindowUpdate.invalidIncrement"), - streamId, Error.PROTOCOL_ERROR); + Error.PROTOCOL_ERROR); } } @@ -327,7 +327,7 @@ class Http2Parser { // No headers to continue throw new ConnectionError(sm.getString( "http2Parser.processFrameContinuation.notExpected", connectionId, - Integer.toString(streamId)), 0, Error.PROTOCOL_ERROR); + Integer.toString(streamId)), Error.PROTOCOL_ERROR); } boolean endOfHeaders = Flags.isEndOfHeaders(flags); @@ -358,7 +358,7 @@ class Http2Parser { } catch (HpackException hpe) { throw new ConnectionError( sm.getString("http2Parser.processFrameHeaders.decodingFailed"), - 0, Error.COMPRESSION_ERROR); + Error.COMPRESSION_ERROR); } // switches to write mode headerReadBuffer.compact(); @@ -368,7 +368,7 @@ class Http2Parser { if (headerReadBuffer.position() > 0 && endOfHeaders) { throw new ConnectionError( sm.getString("http2Parser.processFrameHeaders.decodingDataLeft"), - 0, Error.COMPRESSION_ERROR); + Error.COMPRESSION_ERROR); } } @@ -413,25 +413,25 @@ class Http2Parser { if (expected != null && frameType != expected) { throw new StreamError(sm.getString("http2Parser.processFrame.unexpectedType", - expected, frameType), streamId, Error.PROTOCOL_ERROR); + expected, frameType), Error.PROTOCOL_ERROR); } if (payloadSize > maxPayloadSize) { throw new ConnectionError(sm.getString("http2Parser.payloadTooBig", Integer.toString(payloadSize), Integer.toString(maxPayloadSize)), - streamId, Error.FRAME_SIZE_ERROR); + Error.FRAME_SIZE_ERROR); } if (headersCurrentStream != -1) { if (headersCurrentStream != streamId) { throw new ConnectionError(sm.getString("http2Parser.headers.wrongStream", connectionId, Integer.toString(headersCurrentStream), - Integer.toString(streamId)), streamId, Error.COMPRESSION_ERROR); + Integer.toString(streamId)), Error.COMPRESSION_ERROR); } if (frameType != FrameType.CONTINUATION) { throw new ConnectionError(sm.getString("http2Parser.headers.wrongFrameType", connectionId, Integer.toString(headersCurrentStream), - frameType), streamId, Error.COMPRESSION_ERROR); + frameType), Error.COMPRESSION_ERROR); } } @@ -529,7 +529,7 @@ class Http2Parser { void reset(int streamId, long errorCode) throws Http2Exception; // Settings frames - void setting(int identifier, long value) throws IOException; + void setting(int identifier, long value) throws ConnectionError; void settingsEnd(boolean ack) throws IOException; // Ping frames Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1684258&r1=1684257&r2=1684258&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Mon Jun 8 19:51:30 2015 @@ -766,7 +766,7 @@ public class Http2UpgradeHandler extends @Override - public void setting(int identifier, long value) throws IOException { + public void setting(int identifier, long value) throws ConnectionError { remoteSettings.set(identifier, value); } Modified: tomcat/trunk/java/org/apache/coyote/http2/StreamError.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/StreamError.java?rev=1684258&r1=1684257&r2=1684258&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/StreamError.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/StreamError.java Mon Jun 8 19:51:30 2015 @@ -20,7 +20,7 @@ public class StreamError extends Http2Ex private static final long serialVersionUID = 1L; - public StreamError(String msg, int streamId, Error error) { - super(msg, streamId, error); + public StreamError(String msg, Error error) { + super(msg, error); } } Modified: tomcat/trunk/java/org/apache/coyote/http2/StreamStateMachine.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/StreamStateMachine.java?rev=1684258&r1=1684257&r2=1684258&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/StreamStateMachine.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/StreamStateMachine.java Mon Jun 8 19:51:30 2015 @@ -110,11 +110,11 @@ public class StreamStateMachine { if (state.connectionErrorForInvalidFrame) { throw new ConnectionError(sm.getString("streamStateMachine.invalidFrame", stream.getConnectionId(), stream.getIdentifier(), state, frameType), - stream.getIdentifier().intValue(), state.errorCodeForInvalidFrame); + state.errorCodeForInvalidFrame); } else { throw new StreamError(sm.getString("streamStateMachine.invalidFrame", stream.getConnectionId(), stream.getIdentifier(), state, frameType), - stream.getIdentifier().intValue(), state.errorCodeForInvalidFrame); + state.errorCodeForInvalidFrame); } } } Modified: tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java?rev=1684258&r1=1684257&r2=1684258&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java (original) +++ tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java Mon Jun 8 19:51:30 2015 @@ -499,7 +499,7 @@ public abstract class Http2TestBase exte @Override - public void setting(int identifier, long value) throws IOException { + public void setting(int identifier, long value) throws ConnectionError { trace.append("0-Settings-[" + identifier + "]-[" + value + "]\n"); remoteSettings.set(identifier, value); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org