db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1145553 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests: DriverUnloader.java PhaseChanger.java
Date Tue, 12 Jul 2011 11:36:54 GMT
Author: kahatlen
Date: Tue Jul 12 11:36:53 2011
New Revision: 1145553

URL: http://svn.apache.org/viewvc?rev=1145553&view=rev
Log:
DERBY-5316: Unload old JDBC drivers when done with them in the upgrade tests

Assert that the driver is only unloaded in the affected versions.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/DriverUnloader.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/PhaseChanger.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/DriverUnloader.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/DriverUnloader.java?rev=1145553&r1=1145552&r2=1145553&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/DriverUnloader.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/DriverUnloader.java
Tue Jul 12 11:36:53 2011
@@ -33,13 +33,21 @@ import java.util.Enumeration;
  */
 public class DriverUnloader {
     /**
-     * Deregister all JDBC drivers accessible from the class loader in which
+     * Deregister all Derby drivers accessible from the class loader in which
      * this class lives.
+     *
+     * @return {@code true} if a driver was unloaded, {@code false} otherwise
      */
-    public static void unload() throws SQLException {
+    public static boolean unload() throws SQLException {
+        boolean ret = false;
         Enumeration e = DriverManager.getDrivers();
         while (e.hasMoreElements()) {
-            DriverManager.deregisterDriver((Driver) e.nextElement());
+            Driver driver = (Driver) e.nextElement();
+            if (driver.getClass().getName().startsWith("org.apache.derby.")) {
+                DriverManager.deregisterDriver(driver);
+                ret = true;
+            }
         }
+        return ret;
     }
 }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/PhaseChanger.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/PhaseChanger.java?rev=1145553&r1=1145552&r2=1145553&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/PhaseChanger.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/PhaseChanger.java
Tue Jul 12 11:36:53 2011
@@ -127,18 +127,16 @@ final class PhaseChanger extends BaseTes
         DataSource ds = JDBCDataSource.getDataSource();
         JDBCDataSource.shutEngine(ds);
 
-        // When we're done with the old driver, make sure it's deregistered
-        // from the DriverManager (if running on a platform that has the
-        // DriverManager class). The shutEngine() should also deregister the
-        // driver, but on some versions it doesn't (DERBY-2905, DERBY-5316).
-        if (phase == UpgradeChange.PH_POST_HARD_UPGRADE &&
-                JDBC.vmSupportsJDBC3()) {
+        // When shutting down the old engine for good, make sure that it's
+        // made eligible for garbage collection by working around bugs in
+        // some of the old versions.
+        if (phase == UpgradeChange.PH_POST_HARD_UPGRADE) {
+            // Workaround for DERBY-2905. Some versions don't deregister the
+            // JDBC driver when shutting down the engine.
             deregisterDriver();
-        }
 
-        // Workaround for DERBY-4895, which prevented the engine classes from
-        // being garbage collected.
-        if (phase == UpgradeChange.PH_POST_HARD_UPGRADE) {
+            // Workaround for DERBY-4895, which prevented the engine classes
+            // from being garbage collected.
             clearDerby4895ThreadLocal();
         }
 
@@ -152,18 +150,31 @@ final class PhaseChanger extends BaseTes
     }
 
     /**
-     * Deregister all JDBC drivers in the class loader associated with this
-     * version.
+     * Make sure the JDBC driver in the class loader associated with this
+     * version is deregistered. This is a workaround for DERBY-2905, which
+     * affected Derby 10.2 - 10.7, and it is needed to make the old engine
+     * classes eligible for garbage collection.
      */
     private void deregisterDriver() throws Exception {
-        // DriverManager only allows deregistering of drivers from classes
-        // that live in a class loader that is able to load the driver. So
-        // create an instance of DriverUnloader in the old driver's class
-        // loader.
-        Class unloader = Class.forName(
-                DriverUnloader.class.getName(), true, loader);
-        Method m = unloader.getMethod("unload", (Class[]) null);
-        m.invoke(null, (Object[]) null);
+        boolean isAffectedVersion =
+                UpgradeRun.lessThan(new int[] {10,2,0,0}, version) &&
+                UpgradeRun.lessThan(version, new int[] {10,8,0,0});
+
+        if (JDBC.vmSupportsJDBC3()) {
+            // DriverManager only allows deregistering of drivers from classes
+            // that live in a class loader that is able to load the driver. So
+            // create an instance of DriverUnloader in the old driver's class
+            // loader.
+            Class unloader = Class.forName(
+                    DriverUnloader.class.getName(), true, loader);
+            Method m = unloader.getMethod("unload", (Class[]) null);
+            Boolean res = (Boolean) m.invoke(null, (Object[]) null);
+
+            // Check that there weren't any drivers to unload except in the
+            // versions affected by DERBY-2905.
+            assertEquals("Unexpected result from driver unloading",
+                         isAffectedVersion, res.booleanValue());
+        }
     }
 
     /**



Mime
View raw message