Author: markt
Date: Sun Nov 29 14:25:04 2009
New Revision: 885231
URL: http://svn.apache.org/viewvc?rev=885231&view=rev
Log:
Add logging when a context fails to unregister a JDBC driver.
Don't unregister the jdbc-obdc bridge driver that is loaded by the system
classloader.
Modified:
tomcat/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java?rev=885231&r1=885230&r2=885231&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java Sun
Nov 29 14:25:04 2009
@@ -21,7 +21,9 @@
import java.sql.Driver;
import java.sql.DriverManager;
import java.sql.SQLException;
+import java.util.ArrayList;
import java.util.Enumeration;
+import java.util.List;
/**
* This class is loaded by the {...@link WebappClassLoader} to enable it to
@@ -36,14 +38,28 @@
*/
public class JdbcLeakPrevention {
- public void clearJdbcDriverRegistrations() throws SQLException {
+ /*
+ * This driver is visible to all classloaders but is loaded by the system
+ * class loader so there is no need to unload it.
+ */
+ private static final String JDBC_ODBC_BRIDGE_DRIVER =
+ "sun.jdbc.odbc.JdbcOdbcDriver";
+
+ public List<String> clearJdbcDriverRegistrations() throws SQLException {
+ List<String> driverNames = new ArrayList<String>();
+
// Unregister any JDBC drivers loaded by the class loader that loaded
// this class - ie the webapp class loader
Enumeration<Driver> drivers = DriverManager.getDrivers();
while (drivers.hasMoreElements()) {
Driver driver = drivers.nextElement();
+ if (JDBC_ODBC_BRIDGE_DRIVER.equals(
+ driver.getClass().getCanonicalName())) {
+ continue;
+ }
+ driverNames.add(driver.getClass().getCanonicalName());
DriverManager.deregisterDriver(driver);
}
-
+ return driverNames;
}
}
Modified: tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties?rev=885231&r1=885230&r2=885231&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties Sun
Nov 29 14:25:04 2009
@@ -33,6 +33,7 @@
webappClassLoader.jdbcRemoveStreamError=Exception closing input stream during
JDBC driver de-registration
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.uncleareredReferenceJbdc=A web application registered the
JBDC driver [{0}] but failed to unregister it when the web application was
stopped. To prevent a memory leak, the JDBC Driver has been forcibly
unregistered.
webappClassLoader.wrongVersion=(unable to load class {0})
webappLoader.addRepository=Adding repository {0}
webappLoader.deploy=Deploying class repositories to work directory {0}
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=885231&r1=885230&r2=885231&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Sun Nov
29 14:25:04 2009
@@ -42,6 +42,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
+import java.util.List;
import java.util.Map;
import java.util.Vector;
import java.util.jar.Attributes;
@@ -1672,8 +1673,13 @@
defineClass("org.apache.catalina.loader.JdbcLeakPrevention",
classBytes, 0, offset);
Object obj = lpClass.newInstance();
- obj.getClass().getMethod(
+ @SuppressWarnings("unchecked")
+ List<String> driverNames = (List<String>) obj.getClass().getMethod(
"clearJdbcDriverRegistrations").invoke(obj);
+ for (String name : driverNames) {
+ log.error(sm.getString(
+ "webappClassLoader.uncleareredReferenceJbdc", name));
+ }
} catch (Exception e) {
// So many things to go wrong above...
log.warn(sm.getString("webappClassLoader.jdbcRemoveFailed"), e);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
