From 6a8a9b1bcd58556cade0d6a157b27febbafd0c46 Mon Sep 17 00:00:00 2001 From: kkolinko Date: Sun, 12 Dec 2010 22:33:09 +0000 Subject: [PATCH] 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 --- java/org/apache/catalina/session/LocalStrings.properties | 2 ++ java/org/apache/catalina/session/StandardManager.java | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/java/org/apache/catalina/session/LocalStrings.properties b/java/org/apache/catalina/session/LocalStrings.properties index 02326a194..9ef362f5a 100644 --- 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 d75454801..4c3e59066 100644 --- 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 } -- 2.11.0