Author: markt Date: Sun Apr 28 13:19:48 2013 New Revision: 1476761 URL: http://svn.apache.org/r1476761 Log: Improve logging by naming the Servlet that hasn't stopped.
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1476761&r1=1476760&r2=1476761&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties (original) +++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Sun Apr 28 13:19:48 2013 @@ -175,7 +175,7 @@ standardWrapper.serviceExceptionRoot=Ser standardWrapper.unavailable=Marking servlet {0} as unavailable standardWrapper.unloadException=Servlet {0} threw unload() exception standardWrapper.unloading=Cannot allocate servlet {0} because it is being unloaded -standardWrapper.waiting=Waiting for {0} instance(s) to be deallocated +standardWrapper.waiting=Waiting for {0} instance(s) to be deallocated for Servlet [{1}] threadLocalLeakPreventionListener.lifecycleEvent.error=Exception processing lifecycle event {0} threadLocalLeakPreventionListener.containerEvent.error=Exception processing container event {0} Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1476761&r1=1476760&r2=1476761&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Sun Apr 28 13:19:48 2013 @@ -1403,7 +1403,8 @@ public class StandardWrapper extends Con while ((nRetries < 21) && (countAllocated.get() > 0)) { if ((nRetries % 10) == 0) { log.info(sm.getString("standardWrapper.waiting", - countAllocated.toString())); + countAllocated.toString(), + getName())); } try { Thread.sleep(delay); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org