Author: markt
Date: Fri Jun 21 12:23:43 2013
New Revision: 1495407
URL: http://svn.apache.org/r1495407
Log:
Read response bodies for error responses as well as non-error responses.
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Modified: tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1495407&r1=1495406&r2=1495407&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Fri Jun
21 12:23:43 2013
@@ -373,23 +373,27 @@ public abstract class TomcatBaseTest ext
Map<String, List<String>> head = connection.getHeaderFields();
resHead.putAll(head);
}
- if (rc == HttpServletResponse.SC_OK) {
- InputStream is = connection.getInputStream();
- BufferedInputStream bis = null;
- try {
- bis = new BufferedInputStream(is);
- byte[] buf = new byte[2048];
- int rd = 0;
- while((rd = bis.read(buf)) > 0) {
- out.append(buf, 0, rd);
- }
- } finally {
- if (bis != null) {
- try {
- bis.close();
- } catch (IOException e) {
- // Ignore
- }
+ InputStream is;
+ if (rc < 400) {
+ is = connection.getInputStream();
+ } else {
+ is = connection.getErrorStream();
+ }
+
+ BufferedInputStream bis = null;
+ try {
+ bis = new BufferedInputStream(is);
+ byte[] buf = new byte[2048];
+ int rd = 0;
+ while((rd = bis.read(buf)) > 0) {
+ out.append(buf, 0, rd);
+ }
+ } finally {
+ if (bis != null) {
+ try {
+ bis.close();
+ } catch (IOException e) {
+ // Ignore
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
