Author: kkolinko Date: Tue Nov 13 02:58:35 2012 New Revision: 1408566 URL: http://svn.apache.org/viewvc?rev=1408566&view=rev Log: Merged revisions r1408562 r1408565 from tomcat/trunk: Fix an NPE caused by r1408520 Fix trailing whitespace, as nagged by Checkstyle
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1408562-1408565 Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java?rev=1408566&r1=1408565&r2=1408566&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java Tue Nov 13 02:58:35 2012 @@ -222,7 +222,9 @@ public abstract class SimpleHttpClient { // clear any residual data before starting on this response responseHeaders.clear(); responseBody = null; - bodyUriElements.clear(); + if (bodyUriElements != null) { + bodyUriElements.clear(); + } // Read the response status line responseLine = readLine(); @@ -311,7 +313,7 @@ public abstract class SimpleHttpClient { * * <p> * Note: This method has the following limitations: a) It assumes that the - * response is HTML. b) It searches for lowercase tags only. + * response is HTML. b) It searches for lowercase tags only. * * @see #getResponseBodyUriElements() */ --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org