From: kfujino <kfujino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 21 Dec 2010 09:47:15 +0000 (+0000)
Subject: Fix webappClassLoader.clearJbdc message key and message in LocalStrings.properties.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=502165c024a89a4480b24c688b6664c46ca9db13;p=tomcat7.0

Fix webappClassLoader.clearJbdc message key and message in LocalStrings.properties.
Jbdc is corrected to jdbc.

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

diff --git a/java/org/apache/catalina/loader/LocalStrings.properties b/java/org/apache/catalina/loader/LocalStrings.properties
index f7daddec0..a08a05a8e 100644
--- a/java/org/apache/catalina/loader/LocalStrings.properties
+++ b/java/org/apache/catalina/loader/LocalStrings.properties
@@ -39,7 +39,7 @@ webappClassLoader.jdbcRemoveFailed=JDBC driver de-registration failed for web ap
 webappClassLoader.jdbcRemoveStreamError=Exception closing input stream during JDBC driver de-registration for web application [{0}]
 webappClassLoader.stopped=Illegal access: this web application instance has been stopped already.  Could not load {0}.  The eventual following stack trace is caused by an error thrown for debugging purposes as well as to attempt to terminate the thread which caused the illegal access, and has no functional impact.
 webappClassLoader.readError=Resource read error: Could not load {0}.
-webappClassLoader.clearJbdc=The web application [{0}] registered the JBDC driver [{1}] but failed to unregister it when the web application was stopped. To prevent a memory leak, the JDBC Driver has been forcibly unregistered.
+webappClassLoader.clearJdbc=The web application [{0}] registered the JDBC driver [{1}] but failed to unregister it when the web application was stopped. To prevent a memory leak, the JDBC Driver has been forcibly unregistered.
 webappClassLoader.clearReferencesResourceBundlesCount=Removed [{0}] ResourceBundle references from the cache for web application [{1}]
 webappClassLoader.clearReferencesResourceBundlesFail=Failed to clear ResourceBundle references for web application [{0}]
 webappClassLoader.clearRmiInfo=Failed to find class sun.rmi.transport.Target to clear context class loader for web application [{0}]. This is expected on non-Sun JVMs.
diff --git a/java/org/apache/catalina/loader/WebappClassLoader.java b/java/org/apache/catalina/loader/WebappClassLoader.java
index f427bb5aa..39e10b9e6 100644
--- a/java/org/apache/catalina/loader/WebappClassLoader.java
+++ b/java/org/apache/catalina/loader/WebappClassLoader.java
@@ -1999,7 +1999,7 @@ public class WebappClassLoader
             List<String> driverNames = (List<String>) obj.getClass().getMethod(
                     "clearJdbcDriverRegistrations").invoke(obj);
             for (String name : driverNames) {
-                log.error(sm.getString("webappClassLoader.clearJbdc",
+                log.error(sm.getString("webappClassLoader.clearJdbc",
                         contextName, name));
             }
         } catch (Exception e) {