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...@apache.org on 2001/09/27 03:01:10 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves ErrorReportValve.java
remm 01/09/26 18:01:10
Modified: catalina/src/share/org/apache/catalina/valves
ErrorReportValve.java
Log:
- The error report valve should use the internal response object to ignore the commit
state of the facade.
Revision Changes Path
1.3 +10 -11 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java
Index: ErrorReportValve.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ErrorReportValve.java 2001/09/26 17:44:51 1.2
+++ ErrorReportValve.java 2001/09/27 01:01:10 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java,v 1.2 2001/09/26 17:44:51 remm Exp $
- * $Revision: 1.2 $
- * $Date: 2001/09/26 17:44:51 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java,v 1.3 2001/09/27 01:01:10 remm Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/09/27 01:01:10 $
*
* ====================================================================
*
@@ -104,7 +104,7 @@
* @author Craig R. McClanahan
* @author <a href="mailto:nicolaken@supereva.it">Nicola Ken Barozzi</a> Aisa
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version $Revision: 1.2 $ $Date: 2001/09/26 17:44:51 $
+ * @version $Revision: 1.3 $ $Date: 2001/09/27 01:01:10 $
*/
public class ErrorReportValve
@@ -169,11 +169,11 @@
// Perform the request
context.invokeNext(request, response);
- ServletResponse sresp = response.getResponse();
+ ServletResponse sresp = (ServletResponse) response;
if (sresp.isCommitted())
return;
- ServletRequest sreq = request.getRequest();
+ ServletRequest sreq = (ServletRequest) request;
Throwable throwable =
(Throwable) sreq.getAttribute(Globals.EXCEPTION_ATTR);
@@ -184,12 +184,12 @@
// Reset the response (if possible)
try {
- response.getResponse().reset();
+ sresp.reset();
} catch (IllegalStateException e) {
;
}
- ServletResponse sresponse = response.getResponse();
+ ServletResponse sresponse = (ServletResponse) response;
if (sresponse instanceof HttpServletResponse)
((HttpServletResponse) sresponse).sendError
(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
@@ -237,10 +237,9 @@
if (!(response instanceof HttpResponse))
return;
HttpResponse hresponse = (HttpResponse) response;
- if (!(response.getResponse() instanceof HttpServletResponse))
+ if (!(response instanceof HttpServletResponse))
return;
- HttpServletResponse hres =
- (HttpServletResponse) response.getResponse();
+ HttpServletResponse hres = (HttpServletResponse) response;
int statusCode = hresponse.getStatus();
String message = RequestUtil.filter(hresponse.getMessage());
if (message == null)