tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r812110 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/loader/JdbcLeakPrevention.java java/org/apache/catalina/loader/WebappClassLoader.java webapps/docs/changelog.xml
Date Mon, 07 Sep 2009 12:34:15 GMT
Author: markt
Date: Mon Sep  7 12:34:14 2009
New Revision: 812110

URL: http://svn.apache.org/viewvc?rev=812110&view=rev
Log:
Fix JDBC driver de-registration

Added:
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java   (props
changed)
      - copied unchanged from r789389, tomcat/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java
Modified:
    tomcat/tc6.0.x/trunk/   (props changed)
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep  7 12:34:14 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77
 7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,797168,797425,797596,797607
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77
 7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,797168,797425,797596,797607

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=812110&r1=812109&r2=812110&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Sep  7 12:34:14 2009
@@ -144,17 +144,6 @@
   +1: kkolinko, markt, rjung, funkman
   -1: 
 
-* Fix the JDBC driver clean-up
-  http://svn.apache.org/viewvc?view=rev&revision=789389
-  See below for additional fix required
-  +1: markt, rjung, funkman
-  -1: 
-  rjung: I don't really like the implicit 4KB class size limit.
-  I understand your rationale, but we don't know enough about other JVMs
-  and the future in general.
-  I think it would be nice to improve in a second step by resizing the
-  array according to the class size. AFAIK it's not a performance critical path.
-
 * Fix NPE observed when unpackWARs="false" with above fix
   http://svn.apache.org/viewvc?view=rev&revision=805153
   +1: markt, funkman, rjung

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=812110&r1=812109&r2=812110&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Mon Sep  7
12:34:14 2009
@@ -36,9 +36,6 @@
 import java.security.PermissionCollection;
 import java.security.Policy;
 import java.security.PrivilegedAction;
-import java.sql.Driver;
-import java.sql.DriverManager;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -1602,18 +1599,55 @@
      */
     protected void clearReferences() {
 
-        // Unregister any JDBC drivers loaded by this classloader
-        Enumeration drivers = DriverManager.getDrivers();
-        while (drivers.hasMoreElements()) {
-            Driver driver = (Driver) drivers.nextElement();
-            if (driver.getClass().getClassLoader() == this) {
+        /*
+         * Deregister any JDBC drivers registered by the webapp that the webapp
+         * forgot. This is made unnecessary complex because a) DriverManager
+         * checks the class loader of the calling class (it would be much easier
+         * if it checked the context class loader) b) using reflection would
+         * create a dependency on the DriverManager implementation which can,
+         * and has, changed.
+         * 
+         * We can't just create an instance of JdbcLeakPrevention as it will be
+         * loaded by the common class loader (since it's .class file is in the
+         * $CATALINA_HOME/lib directory). This would fail DriverManager's check
+         * on the class loader of the calling class. So, we load the bytes via
+         * our parent class loader but define the class with this class loader
+         * so the JdbcLeakPrevention looks like a webapp class to the
+         * DriverManager.
+         * 
+         * If only apps cleaned up after themselves...
+         */
+        InputStream is = getResourceAsStream(
+                "org/apache/catalina/loader/JdbcLeakPrevention.class");
+        // Cheat - we know roughly how big the class will be (~1K) but allow
+        // plenty room to grow
+        byte[] classBytes = new byte[4096];
+        int offset = 0;
                 try {
-                    DriverManager.deregisterDriver(driver);
-                } catch (SQLException e) {
-                    log.warn("SQL driver deregistration failed", e);
-                }
+            int read = is.read(classBytes, offset, 4096-offset);
+            while (read > -1) {
+                offset += read;
+                read = is.read(classBytes, offset, 4096-offset);
+                }
+            Class<?> lpClass =
+                defineClass("org.apache.catalina.loader.JdbcLeakPrevention",
+                    classBytes, 0, offset);
+            Object obj = lpClass.newInstance();
+            obj.getClass().getMethod(
+                    "clearJdbcDriverRegistrations").invoke(obj);
+        } catch (Exception e) {
+            // So many things to go wrong above...
+            log.warn(sm.getString("webappClassLoader.jdbcRemoveFailed"), e);
+        } finally {
+            if (is != null) {
+                try {
+                    is.close();
+                } catch (IOException ioe) {
+                    log.warn(sm.getString(
+                            "webappClassLoader.jdbcRemoveStreamError"), ioe);
             }
         }
+        }
         
         // Null out any static or final fields from loaded classes,
         // as a workaround for apparent garbage collection bugs

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=812110&r1=812109&r2=812110&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Sep  7 12:34:14 2009
@@ -151,6 +151,9 @@
       <add>
         Provide debug logging for JNDI lookups. (markt)
       </add>
+      <fix>
+        Correct JDBC driver de-registration on web application stop. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message