Use i18n for the messages

It is followup to r1042022 which was a fix for BZ 48973

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1044944 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/session/LocalStrings.properties b/java/org/apache/catalina/session/LocalStrings.properties
index 02326a1..9ef362f 100644 (file)
--- a/java/org/apache/catalina/session/LocalStrings.properties
+++ b/java/org/apache/catalina/session/LocalStrings.properties
@@ -36,7 +36,9 @@ standardManager.loading=Loading persisted sessions from {0}
 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

diff --git a/java/org/apache/catalina/session/StandardManager.java b/java/org/apache/catalina/session/StandardManager.java
index d754548..4c3e590 100644 (file)
--- a/java/org/apache/catalina/session/StandardManager.java
+++ b/java/org/apache/catalina/session/StandardManager.java
@@ -365,10 +365,10 @@ public class StandardManager extends ManagerBase {
     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
         }