You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@locus.apache.org on 2000/08/19 07:27:22 UTC
cvs commit: jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core StandardWrapperValve.java
remm 00/08/18 22:27:22
Modified: proposals/catalina/src/share/org/apache/tomcat/core
StandardWrapperValve.java
Log:
- Oops, forgot to commit a part of the last patch ...
Revision Changes Path
1.17 +12 -11 jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardWrapperValve.java
Index: StandardWrapperValve.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardWrapperValve.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- StandardWrapperValve.java 2000/08/08 01:29:43 1.16
+++ StandardWrapperValve.java 2000/08/19 05:27:21 1.17
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardWrapperValve.java,v 1.16 2000/08/08 01:29:43 craigmcc Exp $
- * $Revision: 1.16 $
- * $Date: 2000/08/08 01:29:43 $
+ * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardWrapperValve.java,v 1.17 2000/08/19 05:27:21 remm Exp $
+ * $Revision: 1.17 $
+ * $Date: 2000/08/19 05:27:21 $
*
* ====================================================================
*
@@ -98,7 +98,7 @@
* <code>StandardWrapper</code> container implementation.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.16 $ $Date: 2000/08/08 01:29:43 $
+ * @version $Revision: 1.17 $ $Date: 2000/08/19 05:27:21 $
*/
final class StandardWrapperValve
@@ -495,6 +495,13 @@
HttpServletResponse hres =
(HttpServletResponse) response.getResponse();
int statusCode = hresponse.getStatus();
+
+ // Do nothing on an OK status
+ if (statusCode == HttpServletResponse.SC_OK)
+ return;
+ if (statusCode < 400)
+ return;
+
String message = hresponse.getMessage();
if (message == null)
message = "";
@@ -511,12 +518,6 @@
return;
}
- // Do nothing on an OK status
- if (statusCode == HttpServletResponse.SC_OK)
- return;
- if (statusCode < 300)
- return;
-
// Do nothing if there is no report for the specified status code
String report = null;
try {
@@ -546,7 +547,7 @@
hres.flushBuffer();
} catch (IOException e) {
;
- }
+ }
writer.println("<html>");
writer.println("<head>");
writer.println("<title>" +