Author: markt
Date: Mon Jun 1 20:22:14 2015
New Revision: 1682994
URL: http://svn.apache.org/r1682994
Log:
Various minor clean-ups
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2.java
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=1682994&r1=1682993&r2=1682994&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java Mon Jun 1
20:22:14 2015
@@ -62,7 +62,7 @@ class Http2Parser {
*
* @return <code>true</code> if a valid preface was read, otherwise false.
*/
- public boolean readConnectionPreface() {
+ boolean readConnectionPreface() {
if (readPreface) {
return true;
}
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=1682994&r1=1682993&r2=1682994&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java Mon Jun 1
20:22:14 2015
@@ -213,13 +213,12 @@ public abstract class Http2TestBase exte
// Generate content with a simple known format.
resp.setContentType("application/octet-stream");
- int count = 16 * 1024;
+ int count = 4 * 1024;
// Two bytes per entry
resp.setContentLengthLong(count * 2);
OutputStream os = resp.getOutputStream();
byte[] data = new byte[2];
- // 1024 * 16 * 2 bytes = 32k of content.
for (int i = 0; i < count; i++) {
data[0] = (byte) (i & 0xFF);
data[1] = (byte) ((i >> 8) & 0xFF);
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2.java?rev=1682994&r1=1682993&r2=1682994&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2.java Mon Jun
1 20:22:14 2015
@@ -138,6 +138,6 @@ public class TestHttp2Section_3_2 extend
return;
}
}
- throw new IOException("No content-length");
+ Assert.fail("No content-length");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
