Author: kkolinko Date: Sun Dec 12 22:33:09 2010 New Revision: 1044944 URL: http://svn.apache.org/viewvc?rev=1044944&view=rev Log: Use i18n for the messages It is followup to r1042022 which was a fix for BZ 48973
Modified: tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties tomcat/trunk/java/org/apache/catalina/session/StandardManager.java Modified: tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties?rev=1044944&r1=1044943&r2=1044944&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties (original) +++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties Sun Dec 12 22:33:09 2010 @@ -36,7 +36,9 @@ standardManager.loading=Loading persiste standardManager.loading.cnfe=ClassNotFoundException while loading persisted sessions: {0} standardManager.loading.ioe=IOException while loading persisted sessions: {0} standardManager.unloading=Saving persisted sessions to {0} +standardManager.unloading.debug=Unloading persisted sessions standardManager.unloading.ioe=IOException while saving persisted sessions: {0} +standardManager.unloading.nosessions=No persisted sessions to unload standardManager.managerLoad=Exception loading sessions from persistent storage standardManager.managerUnload=Exception unloading sessions to persistent storage standardSession.attributeEvent=Session attribute event listener threw exception Modified: tomcat/trunk/java/org/apache/catalina/session/StandardManager.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardManager.java?rev=1044944&r1=1044943&r2=1044944&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/session/StandardManager.java (original) +++ tomcat/trunk/java/org/apache/catalina/session/StandardManager.java Sun Dec 12 22:33:09 2010 @@ -365,10 +365,10 @@ public class StandardManager extends Man protected void doUnload() throws IOException { if (log.isDebugEnabled()) - log.debug("Unloading persisted sessions"); - + log.debug(sm.getString("standardManager.unloading.debug")); + if (sessions.isEmpty()) { - log.debug("No persisted sessions to unload"); + log.debug(sm.getString("standardManager.unloading.nosessions")); return; // nothing to do } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org