Author: markt Date: Mon Jun 21 17:52:25 2010 New Revision: 956653 URL: http://svn.apache.org/viewvc?rev=956653&view=rev Log: Add support for additional 500 error codes. Allow responses to include blank lines
Modified: tomcat/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java Modified: tomcat/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java?rev=956653&r1=956652&r2=956653&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java (original) +++ tomcat/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java Mon Jun 21 17:52:25 2010 @@ -44,7 +44,9 @@ public abstract class SimpleHttpClient { public static final String OK_200 = "HTTP/1.1 200"; public static final String FAIL_404 = "HTTP/1.1 404"; + public static final String FAIL_50X = "HTTP/1.1 50"; public static final String FAIL_500 = "HTTP/1.1 500"; + public static final String FAIL_501 = "HTTP/1.1 501"; private Socket socket; private Writer writer; @@ -121,7 +123,7 @@ public abstract class SimpleHttpClient { StringBuilder builder = new StringBuilder(); if (readBody) { line = readLine(); - while (line != null && line.length() > 0) { + while (line != null) { builder.append(line); line = readLine(); } @@ -161,10 +163,18 @@ public abstract class SimpleHttpClient { return getResponseLine().startsWith(FAIL_404); } + public boolean isResponse50x() { + return getResponseLine().startsWith(FAIL_50X); + } + public boolean isResponse500() { return getResponseLine().startsWith(FAIL_500); } + public boolean isResponse501() { + return getResponseLine().startsWith(FAIL_501); + } + public Socket getSocket() { return socket; } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org