Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 862A0177D6 for ; Mon, 1 Jun 2015 20:22:15 +0000 (UTC) Received: (qmail 121 invoked by uid 500); 1 Jun 2015 20:22:15 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 99951 invoked by uid 500); 1 Jun 2015 20:22:15 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 99940 invoked by uid 99); 1 Jun 2015 20:22:15 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2015 20:22:15 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 012F2AC0922 for ; Mon, 1 Jun 2015 20:22:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1682994 - in /tomcat/trunk: java/org/apache/coyote/http2/Http2Parser.java test/org/apache/coyote/http2/Http2TestBase.java test/org/apache/coyote/http2/TestHttp2Section_3_2.java Date: Mon, 01 Jun 2015 20:22:14 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150601202215.012F2AC0922@hades.apache.org> 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 true 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-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org