From 5557f950683c21e668d8b8c4c8b448caf5df7868 Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 16 Feb 2007 03:09:39 +0000 Subject: [PATCH] Port fix bug 41608. Make log levels consistent. git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@508295 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/core/StandardWrapperValve.java | 8 ++++---- webapps/docs/changelog.xml | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/java/org/apache/catalina/core/StandardWrapperValve.java b/java/org/apache/catalina/core/StandardWrapperValve.java index b35149a54..887b1e6f0 100644 --- a/java/org/apache/catalina/core/StandardWrapperValve.java +++ b/java/org/apache/catalina/core/StandardWrapperValve.java @@ -238,13 +238,13 @@ final class StandardWrapperValve exception(request, response, e); } catch (IOException e) { request.removeAttribute(Globals.JSP_FILE_ATTR); - container.getLogger().warn(sm.getString("standardWrapper.serviceException", + container.getLogger().error(sm.getString("standardWrapper.serviceException", wrapper.getName()), e); throwable = e; exception(request, response, e); } catch (UnavailableException e) { request.removeAttribute(Globals.JSP_FILE_ATTR); - container.getLogger().warn(sm.getString("standardWrapper.serviceException", + container.getLogger().error(sm.getString("standardWrapper.serviceException", wrapper.getName()), e); // throwable = e; // exception(request, response, e); @@ -425,13 +425,13 @@ final class StandardWrapperValve exception(request, response, e); } catch (IOException e) { request.removeAttribute(Globals.JSP_FILE_ATTR); - container.getLogger().warn(sm.getString("standardWrapper.serviceException", + container.getLogger().error(sm.getString("standardWrapper.serviceException", wrapper.getName()), e); throwable = e; exception(request, response, e); } catch (UnavailableException e) { request.removeAttribute(Globals.JSP_FILE_ATTR); - container.getLogger().warn(sm.getString("standardWrapper.serviceException", + container.getLogger().error(sm.getString("standardWrapper.serviceException", wrapper.getName()), e); // Do not save exception in 'throwable', because we // do not want to do exception(request, response, e) processing diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 17401db52..6691e6101 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -36,6 +36,10 @@ Fix bad comparison for FORM processing, submitted by Anil Saldhana. (remm) + + 41608 Make log levels consistent when Servlet.service() + throws an exception. (markt) + -- 2.11.0