Author: markt
Date: Tue May 26 15:15:44 2015
New Revision: 1681773
URL: http://svn.apache.org/r1681773
Log:
Avoid NPEs so tests fail rather than error
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=1681773&r1=1681772&r2=1681773&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java Tue May
26 15:15:44 2015
@@ -394,52 +394,60 @@ public abstract class SimpleHttpClient {
responseBody = null;
}
+ public boolean responseLineStartsWith(String expected) {
+ String line = getResponseLine();
+ if (line == null) {
+ return false;
+ }
+ return line.startsWith(expected);
+ }
+
public boolean isResponse100() {
- return getResponseLine().startsWith(INFO_100);
+ return responseLineStartsWith(INFO_100);
}
public boolean isResponse200() {
- return getResponseLine().startsWith(OK_200);
+ return responseLineStartsWith(OK_200);
}
public boolean isResponse302() {
- return getResponseLine().startsWith(REDIRECT_302);
+ return responseLineStartsWith(REDIRECT_302);
}
public boolean isResponse303() {
- return getResponseLine().startsWith(REDIRECT_303);
+ return responseLineStartsWith(REDIRECT_303);
}
public boolean isResponse400() {
- return getResponseLine().startsWith(FAIL_400);
+ return responseLineStartsWith(FAIL_400);
}
public boolean isResponse404() {
- return getResponseLine().startsWith(FAIL_404);
+ return responseLineStartsWith(FAIL_404);
}
public boolean isResponse408() {
- return getResponseLine().startsWith(TIMEOUT_408);
+ return responseLineStartsWith(TIMEOUT_408);
}
public boolean isResponse413() {
- return getResponseLine().startsWith(FAIL_413);
+ return responseLineStartsWith(FAIL_413);
}
public boolean isResponse417() {
- return getResponseLine().startsWith(FAIL_417);
+ return responseLineStartsWith(FAIL_417);
}
public boolean isResponse50x() {
- return getResponseLine().startsWith(FAIL_50X);
+ return responseLineStartsWith(FAIL_50X);
}
public boolean isResponse500() {
- return getResponseLine().startsWith(FAIL_500);
+ return responseLineStartsWith(FAIL_500);
}
public boolean isResponse501() {
- return getResponseLine().startsWith(FAIL_501);
+ return responseLineStartsWith(FAIL_501);
}
public Socket getSocket() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
