svn commit: r529036 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java

[markt]

Author: markt
Date: Sun Apr 15 10:45:34 2007
New Revision: 529036

URL: http://svn.apache.org/viewvc?view=rev&rev=529036
Log:
Fix bug 42039. Log a stack trace if a servlet throws an UnavailableException. 
Patch provided by Kawasima Kazuh
Remove some unused code.

Modified:
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java?view=diff&rev=529036&r1=529035&r2=529036
==============================================================================
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java 
Sun Apr 15 10:45:34 2007
@@ -37,8 +37,6 @@
 import org.apache.catalina.connector.Response;
 import org.apache.catalina.util.StringManager;
 import org.apache.catalina.valves.ValveBase;
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.buf.MessageBytes;
 import org.apache.tomcat.util.log.SystemLogHandler;
 
@@ -53,8 +51,6 @@
 final class StandardWrapperValve
     extends ValveBase {
 
-    private static Log log = LogFactory.getLog(StandardWrapperValve.class);
-
     // ----------------------------------------------------- Instance Variables
 
 
@@ -133,6 +129,9 @@
                 servlet = wrapper.allocate();
             }
         } catch (UnavailableException e) {
+            container.getLogger().error(
+                    sm.getString("standardWrapper.allocateException",
+                            wrapper.getName()), e);
             long available = wrapper.getAvailable();
             if ((available > 0L) && (available < Long.MAX_VALUE)) {
                response.setDateHeader("Retry-After", available);



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]