You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2012/03/05 13:05:02 UTC
svn commit: r1297014 -
/tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Author: markt
Date: Mon Mar 5 12:05:02 2012
New Revision: 1297014
URL: http://svn.apache.org/viewvc?rev=1297014&view=rev
Log:
Improve base test to return response body on an error response.
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=1297014&r1=1297013&r2=1297014&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Mon Mar 5 12:05:02 2012
@@ -234,23 +234,26 @@ 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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org