Author: markt Date: Wed Jun 10 08:11:13 2015 New Revision: 1684595 URL: http://svn.apache.org/r1684595 Log: Rename to avoid clash with java.lang.Error
Added: tomcat/trunk/java/org/apache/coyote/http2/Http2Error.java - copied, changed from r1684594, tomcat/trunk/java/org/apache/coyote/http2/Error.java Removed: tomcat/trunk/java/org/apache/coyote/http2/Error.java 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/TestHttp2Section_4_2.java tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_3.java tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_1.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=1684595&r1=1684594&r2=1684595&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/ConnectionError.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/ConnectionError.java Wed Jun 10 08:11:13 2015 @@ -20,7 +20,7 @@ public class ConnectionError extends Htt private static final long serialVersionUID = 1L; - public ConnectionError(String msg, Error error) { + public ConnectionError(String msg, Http2Error 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=1684595&r1=1684594&r2=1684595&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java Wed Jun 10 08:11:13 2015 @@ -82,7 +82,7 @@ public class ConnectionSettings { // 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)), Error.PROTOCOL_ERROR); + Long.toString(headerTableSize)), Http2Error.PROTOCOL_ERROR); } this.headerTableSize = (int) headerTableSize; } @@ -96,7 +96,7 @@ public class ConnectionSettings { // will never be negative if (enablePush > 1) { throw new ConnectionError(sm.getString("connectionSettings.enablePushInvalid", - Long.toString(enablePush)), Error.PROTOCOL_ERROR); + Long.toString(enablePush)), Http2Error.PROTOCOL_ERROR); } this.enablePush = (enablePush == 1); } @@ -117,7 +117,7 @@ public class ConnectionSettings { if (initialWindowSize > MAX_WINDOW_SIZE) { throw new ConnectionError(sm.getString("connectionSettings.windowSizeTooBig", Long.toString(initialWindowSize), Long.toString(MAX_WINDOW_SIZE)), - Error.PROTOCOL_ERROR); + Http2Error.PROTOCOL_ERROR); } this.initialWindowSize = (int) initialWindowSize; } @@ -130,7 +130,7 @@ public class ConnectionSettings { 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)), Error.PROTOCOL_ERROR); + Integer.toString(MAX_MAX_FRAME_SIZE)), Http2Error.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=1684595&r1=1684594&r2=1684595&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/FrameType.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/FrameType.java Wed Jun 10 08:11:13 2015 @@ -62,7 +62,7 @@ public enum FrameType { // Is FrameType valid for the given stream? if (streamId == 0 && !streamZero || streamId != 0 && !streamNonZero) { throw new ConnectionError(sm.getString("frameType.checkStream", this), - Error.PROTOCOL_ERROR); + Http2Error.PROTOCOL_ERROR); } // Is the payload size valid for the given FrameType @@ -70,11 +70,11 @@ public enum FrameType { if (payloadErrorFatal || streamId == 0) { throw new ConnectionError(sm.getString("frameType.checkPayloadSize", Integer.toString(payloadSize), this), - Error.FRAME_SIZE_ERROR); + Http2Error.FRAME_SIZE_ERROR); } else { throw new StreamError(sm.getString("frameType.checkPayloadSize", Integer.toString(payloadSize), this), - Error.FRAME_SIZE_ERROR, streamId); + Http2Error.FRAME_SIZE_ERROR, streamId); } } } Copied: tomcat/trunk/java/org/apache/coyote/http2/Http2Error.java (from r1684594, tomcat/trunk/java/org/apache/coyote/http2/Error.java) URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Error.java?p2=tomcat/trunk/java/org/apache/coyote/http2/Http2Error.java&p1=tomcat/trunk/java/org/apache/coyote/http2/Error.java&r1=1684594&r2=1684595&rev=1684595&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/Error.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/Http2Error.java Wed Jun 10 08:11:13 2015 @@ -16,7 +16,7 @@ */ package org.apache.coyote.http2; -public enum Error { +public enum Http2Error { NO_ERROR (0x00), PROTOCOL_ERROR (0x01), @@ -35,7 +35,7 @@ public enum Error { private final long code; - private Error(long code) { + private Http2Error(long code) { this.code = code; } 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=1684595&r1=1684594&r2=1684595&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/Http2Exception.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/Http2Exception.java Wed Jun 10 08:11:13 2015 @@ -20,16 +20,16 @@ public abstract class Http2Exception ext private static final long serialVersionUID = 1L; - private final Error error; + private final Http2Error error; - public Http2Exception(String msg, Error error) { + public Http2Exception(String msg, Http2Error error) { super(msg); this.error = error; } - public Error getError() { + public 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=1684595&r1=1684594&r2=1684595&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java Wed Jun 10 08:11:13 2015 @@ -246,7 +246,7 @@ class Http2Parser { if (payloadSize > 0 && ack) { throw new ConnectionError(sm.getString( "http2Parser.processFrameSettings.ackWithNonZeroPayload"), - Error.FRAME_SIZE_ERROR); + Http2Error.FRAME_SIZE_ERROR); } if (payloadSize != 0) { @@ -265,7 +265,7 @@ class Http2Parser { private void readPushPromiseFrame(int streamId) throws Http2Exception { throw new ConnectionError(sm.getString("http2Parser.processFramePushPromise", - connectionId, Integer.valueOf(streamId)), Error.PROTOCOL_ERROR); + connectionId, Integer.valueOf(streamId)), Http2Error.PROTOCOL_ERROR); } @@ -310,11 +310,11 @@ class Http2Parser { if (streamId == 0) { throw new ConnectionError( sm.getString("http2Parser.processFrameWindowUpdate.invalidIncrement"), - Error.PROTOCOL_ERROR); + Http2Error.PROTOCOL_ERROR); } else { throw new StreamError( sm.getString("http2Parser.processFrameWindowUpdate.invalidIncrement"), - Error.PROTOCOL_ERROR, streamId); + Http2Error.PROTOCOL_ERROR, streamId); } } @@ -328,7 +328,7 @@ class Http2Parser { // No headers to continue throw new ConnectionError(sm.getString( "http2Parser.processFrameContinuation.notExpected", connectionId, - Integer.toString(streamId)), Error.PROTOCOL_ERROR); + Integer.toString(streamId)), Http2Error.PROTOCOL_ERROR); } boolean endOfHeaders = Flags.isEndOfHeaders(flags); @@ -359,7 +359,7 @@ class Http2Parser { } catch (HpackException hpe) { throw new ConnectionError( sm.getString("http2Parser.processFrameHeaders.decodingFailed"), - Error.COMPRESSION_ERROR); + Http2Error.COMPRESSION_ERROR); } // switches to write mode headerReadBuffer.compact(); @@ -369,7 +369,7 @@ class Http2Parser { if (headerReadBuffer.position() > 0 && endOfHeaders) { throw new ConnectionError( sm.getString("http2Parser.processFrameHeaders.decodingDataLeft"), - Error.COMPRESSION_ERROR); + Http2Error.COMPRESSION_ERROR); } } @@ -414,27 +414,27 @@ class Http2Parser { if (expected != null && frameType != expected) { throw new StreamError(sm.getString("http2Parser.processFrame.unexpectedType", - expected, frameType), Error.PROTOCOL_ERROR, streamId); + expected, frameType), Http2Error.PROTOCOL_ERROR, streamId); } if (payloadSize > maxPayloadSize) { throw new ConnectionError(sm.getString("http2Parser.payloadTooBig", Integer.toString(payloadSize), Integer.toString(maxPayloadSize)), - Error.FRAME_SIZE_ERROR); + Http2Error.FRAME_SIZE_ERROR); } if (headersCurrentStream != -1) { if (headersCurrentStream != streamId) { throw new ConnectionError(sm.getString("http2Parser.headers.wrongStream", connectionId, Integer.toString(headersCurrentStream), - Integer.toString(streamId)), Error.COMPRESSION_ERROR); + Integer.toString(streamId)), Http2Error.COMPRESSION_ERROR); } if (frameType == FrameType.RST) { // NO-OP: RST is OK here } else if (frameType != FrameType.CONTINUATION) { throw new ConnectionError(sm.getString("http2Parser.headers.wrongFrameType", connectionId, Integer.toString(headersCurrentStream), - frameType), Error.COMPRESSION_ERROR); + frameType), Http2Error.COMPRESSION_ERROR); } } 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=1684595&r1=1684594&r2=1684595&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Wed Jun 10 08:11:13 2015 @@ -632,7 +632,7 @@ public class Http2UpgradeHandler extends Stream result = streams.get(key); if (result == null && unknownIsError) { // Stream has been closed and removed from the map - throw new ConnectionError(sm.getString("upgradeHandler.stream.closed", key), Error.PROTOCOL_ERROR); + throw new ConnectionError(sm.getString("upgradeHandler.stream.closed", key), Http2Error.PROTOCOL_ERROR); } return result; } @@ -643,12 +643,12 @@ public class Http2UpgradeHandler extends if (streamId %2 != 1) { throw new ConnectionError( - sm.getString("upgradeHandler.stream.even", key), Error.PROTOCOL_ERROR); + sm.getString("upgradeHandler.stream.even", key), Http2Error.PROTOCOL_ERROR); } if (streamId <= maxRemoteStreamId) { throw new ConnectionError(sm.getString("upgradeHandler.stream.old", key, - Integer.valueOf(maxRemoteStreamId)), Error.PROTOCOL_ERROR); + Integer.valueOf(maxRemoteStreamId)), Http2Error.PROTOCOL_ERROR); } Stream result = new Stream(key, this); 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=1684595&r1=1684594&r2=1684595&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/StreamError.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/StreamError.java Wed Jun 10 08:11:13 2015 @@ -22,7 +22,7 @@ public class StreamError extends Http2Ex private final int streamId; - public StreamError(String msg, Error error, int streamId) { + public StreamError(String msg, Http2Error error, int streamId) { super(msg, error); this.streamId = streamId; } 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=1684595&r1=1684594&r2=1684595&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/StreamStateMachine.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/StreamStateMachine.java Wed Jun 10 08:11:13 2015 @@ -126,33 +126,33 @@ public class StreamStateMachine { private enum State { - IDLE (true, Error.PROTOCOL_ERROR, FrameType.HEADERS, FrameType.PRIORITY), - OPEN (true, Error.PROTOCOL_ERROR, FrameType.DATA, FrameType.HEADERS, + IDLE (true, Http2Error.PROTOCOL_ERROR, FrameType.HEADERS, FrameType.PRIORITY), + OPEN (true, Http2Error.PROTOCOL_ERROR, FrameType.DATA, FrameType.HEADERS, FrameType.PRIORITY, FrameType.RST, FrameType.PUSH_PROMISE, FrameType.WINDOW_UPDATE), - RESERVED_LOCAL (true, Error.PROTOCOL_ERROR, FrameType.PRIORITY, FrameType.RST, + RESERVED_LOCAL (true, Http2Error.PROTOCOL_ERROR, FrameType.PRIORITY, FrameType.RST, FrameType.WINDOW_UPDATE), - RESERVED_REMOTE (true, Error.PROTOCOL_ERROR, FrameType.HEADERS, FrameType.PRIORITY, + RESERVED_REMOTE (true, Http2Error.PROTOCOL_ERROR, FrameType.HEADERS, FrameType.PRIORITY, FrameType.RST), - HALF_CLOSED_LOCAL (true, Error.PROTOCOL_ERROR, FrameType.DATA, FrameType.HEADERS, + HALF_CLOSED_LOCAL (true, Http2Error.PROTOCOL_ERROR, FrameType.DATA, FrameType.HEADERS, FrameType.PRIORITY, FrameType.RST, FrameType.PUSH_PROMISE, FrameType.WINDOW_UPDATE), - HALF_CLOSED_REMOTE (true, Error.STREAM_CLOSED, FrameType.PRIORITY, FrameType.RST, + HALF_CLOSED_REMOTE (true, Http2Error.STREAM_CLOSED, FrameType.PRIORITY, FrameType.RST, FrameType.WINDOW_UPDATE), - CLOSED_RX (true, Error.STREAM_CLOSED, FrameType.PRIORITY), - CLOSED_TX (true, Error.STREAM_CLOSED, FrameType.PRIORITY, FrameType.RST, + CLOSED_RX (true, Http2Error.STREAM_CLOSED, FrameType.PRIORITY), + CLOSED_TX (true, Http2Error.STREAM_CLOSED, FrameType.PRIORITY, FrameType.RST, FrameType.WINDOW_UPDATE), - CLOSED_RST_RX (false, Error.STREAM_CLOSED, FrameType.PRIORITY), - CLOSED_RST_TX (false, Error.STREAM_CLOSED, FrameType.DATA, FrameType.HEADERS, + CLOSED_RST_RX (false, Http2Error.STREAM_CLOSED, FrameType.PRIORITY), + CLOSED_RST_TX (false, Http2Error.STREAM_CLOSED, FrameType.DATA, FrameType.HEADERS, FrameType.PRIORITY, FrameType.RST, FrameType.PUSH_PROMISE, FrameType.WINDOW_UPDATE), - CLOSED_FINAL (true, Error.PROTOCOL_ERROR, FrameType.PRIORITY); + CLOSED_FINAL (true, Http2Error.PROTOCOL_ERROR, FrameType.PRIORITY); private final boolean connectionErrorForInvalidFrame; - private final Error errorCodeForInvalidFrame; + private final Http2Error errorCodeForInvalidFrame; private final Set<FrameType> frameTypesPermitted = new HashSet<>(); - private State(boolean connectionErrorForInvalidFrame, Error errorCode, + private State(boolean connectionErrorForInvalidFrame, Http2Error errorCode, FrameType... frameTypes) { this.connectionErrorForInvalidFrame = connectionErrorForInvalidFrame; this.errorCodeForInvalidFrame = errorCode; Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java?rev=1684595&r1=1684594&r2=1684595&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java (original) +++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java Wed Jun 10 08:11:13 2015 @@ -62,7 +62,7 @@ public class TestHttp2Section_4_2 extend Assert.assertTrue(output.getTrace(), output.getTrace().startsWith("0-Goaway-[2147483647]-[" + - Error.FRAME_SIZE_ERROR.getCode() + "]-[")); + Http2Error.FRAME_SIZE_ERROR.getCode() + "]-[")); } @Test @@ -91,7 +91,7 @@ public class TestHttp2Section_4_2 extend Assert.assertTrue(output.getTrace(), output.getTrace().startsWith("0-Goaway-[2147483647]-[" + - Error.FRAME_SIZE_ERROR.getCode() + "]-[")); + Http2Error.FRAME_SIZE_ERROR.getCode() + "]-[")); } @@ -120,7 +120,7 @@ public class TestHttp2Section_4_2 extend Assert.assertTrue(output.getTrace(), output.getTrace().startsWith("0-Goaway-[2147483647]-[" + - Error.FRAME_SIZE_ERROR.getCode() + "]-[")); + Http2Error.FRAME_SIZE_ERROR.getCode() + "]-[")); } Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_3.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_3.java?rev=1684595&r1=1684594&r2=1684595&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_3.java (original) +++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_3.java Wed Jun 10 08:11:13 2015 @@ -53,7 +53,7 @@ public class TestHttp2Section_4_3 extend Assert.assertTrue(output.getTrace(), output.getTrace().startsWith("0-Goaway-[2147483647]-[" + - Error.COMPRESSION_ERROR.getCode() + "]-[")); + Http2Error.COMPRESSION_ERROR.getCode() + "]-[")); } @@ -103,6 +103,6 @@ public class TestHttp2Section_4_3 extend Assert.assertTrue(output.getTrace(), output.getTrace().startsWith("0-Goaway-[2147483647]-[" + - Error.COMPRESSION_ERROR.getCode() + "]-[")); + Http2Error.COMPRESSION_ERROR.getCode() + "]-[")); } } Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_1.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_1.java?rev=1684595&r1=1684594&r2=1684595&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_1.java (original) +++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_1.java Wed Jun 10 08:11:13 2015 @@ -40,7 +40,7 @@ public class TestHttp2Section_5_1 extend Assert.assertTrue(output.getTrace(), output.getTrace().startsWith("0-Goaway-[2147483647]-[" + - Error.PROTOCOL_ERROR.getCode() + "]-[")); + Http2Error.PROTOCOL_ERROR.getCode() + "]-[")); } @@ -54,7 +54,7 @@ public class TestHttp2Section_5_1 extend Assert.assertTrue(output.getTrace(), output.getTrace().startsWith("0-Goaway-[2147483647]-[" + - Error.PROTOCOL_ERROR.getCode() + "]-[")); + Http2Error.PROTOCOL_ERROR.getCode() + "]-[")); } @@ -79,7 +79,7 @@ public class TestHttp2Section_5_1 extend Assert.assertTrue(output.getTrace(), output.getTrace().startsWith("0-Goaway-[2147483647]-[" + - Error.STREAM_CLOSED.getCode() + "]-[")); + Http2Error.STREAM_CLOSED.getCode() + "]-[")); } @@ -102,14 +102,14 @@ public class TestHttp2Section_5_1 extend writeFrame(frameHeader, headersPayload); // Send a rst - sendRst(3, Error.INTERNAL_ERROR.getCode()); + sendRst(3, Http2Error.INTERNAL_ERROR.getCode()); // Then try sending some data (which should fail) sendData(3, new byte[] {}); parser.readFrame(true); Assert.assertTrue(output.getTrace(), - output.getTrace().startsWith("3-RST-[" + Error.STREAM_CLOSED.getCode() + "]")); + output.getTrace().startsWith("3-RST-[" + Http2Error.STREAM_CLOSED.getCode() + "]")); } @@ -123,7 +123,7 @@ public class TestHttp2Section_5_1 extend Assert.assertTrue(output.getTrace(), output.getTrace().startsWith("0-Goaway-[2147483647]-[" + - Error.STREAM_CLOSED.getCode() + "]-[")); + Http2Error.STREAM_CLOSED.getCode() + "]-[")); } @@ -149,7 +149,7 @@ public class TestHttp2Section_5_1 extend Assert.assertTrue(output.getTrace(), output.getTrace().startsWith("0-Goaway-[2147483647]-[" + - Error.PROTOCOL_ERROR.getCode() + "]-[")); + Http2Error.PROTOCOL_ERROR.getCode() + "]-[")); } @@ -177,7 +177,7 @@ public class TestHttp2Section_5_1 extend Assert.assertTrue(output.getTrace(), output.getTrace().startsWith("0-Goaway-[2147483647]-[" + - Error.PROTOCOL_ERROR.getCode() + "]-[")); + Http2Error.PROTOCOL_ERROR.getCode() + "]-[")); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org