Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 74573 invoked from network); 1 Mar 2011 09:00:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 1 Mar 2011 09:00:29 -0000 Received: (qmail 53645 invoked by uid 500); 1 Mar 2011 09:00:29 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 53465 invoked by uid 500); 1 Mar 2011 09:00:26 -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 53450 invoked by uid 99); 1 Mar 2011 09:00:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Mar 2011 09:00:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Mar 2011 09:00:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8654023889DA; Tue, 1 Mar 2011 09:00:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1075719 - /tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Date: Tue, 01 Mar 2011 09:00:01 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110301090001.8654023889DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Tue Mar 1 09:00:01 2011 New Revision: 1075719 URL: http://svn.apache.org/viewvc?rev=1075719&view=rev Log: Better fix, we actually need to read 20 byres for the test to pass Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=1075719&r1=1075718&r2=1075719&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java (original) +++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Tue Mar 1 09:00:01 2011 @@ -110,11 +110,15 @@ public class TestTomcat extends TomcatBa InputStream is = null; Reader reader = null; char cbuf[] = new char[20]; + int read = 0; try { - is = conn.getInputStream(); - reader = new InputStreamReader(is); - int len = reader.read(cbuf); - res.getWriter().write(cbuf, 0, len); + while (read < 20) { + is = conn.getInputStream(); + reader = new InputStreamReader(is); + int len = reader.read(cbuf, read, cbuf.length - read); + res.getWriter().write(cbuf, 0, len); + read = read + len; + } } finally { if (reader != null) { try { reader.close(); } catch(IOException ioe) {/*Ignore*/} --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org