From e60ec5df3c8e2e72894d44d25b8f8245c0ed2f04 Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Mon, 13 Jan 2014 06:53:39 -0500
Subject: [PATCH] Added DriverShim to get around issue with loading drivers via
 URLClassLoader

Former-commit-id: 9aac9909503c01e2b41261556252e550a3253005
---
 .../data/nvdcve/DriverLoader.java             | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverLoader.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverLoader.java
index 5004cfb4b..56df31bdb 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverLoader.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverLoader.java
@@ -45,8 +45,7 @@ public final class DriverLoader {
     }
 
     /**
-     * Loads the specified class using the system class loader and registers the
-     * driver with the driver manager.
+     * Loads the specified class using the system class loader and registers the driver with the driver manager.
      *
      * @param className the fully qualified name of the desired class
      * @throws DriverLoadException thrown if the driver cannot be loaded
@@ -57,17 +56,15 @@ public final class DriverLoader {
     }
 
     /**
-     * Loads the specified class by registering the supplied paths to the class
-     * loader and then registers the driver with the driver manager. The
-     * pathToDriver argument is added to the class loader so that an external
-     * driver can be loaded. Note, the pathTodriver can contain a semi-colon
-     * separated list of paths so any dependencies can be added as needed. If a
-     * path in the pathToDriver argument is a directory all files in the
-     * directory are added to the class path.
+     * Loads the specified class by registering the supplied paths to the class loader and then registers the driver
+     * with the driver manager. The pathToDriver argument is added to the class loader so that an external driver can be
+     * loaded. Note, the pathTodriver can contain a semi-colon separated list of paths so any dependencies can be added
+     * as needed. If a path in the pathToDriver argument is a directory all files in the directory are added to the
+     * class path.
      *
      * @param className the fully qualified name of the desired class
-     * @param pathToDriver the path to the JAR file containing the driver; note,
-     * this can be a semi-colon separated list of paths
+     * @param pathToDriver the path to the JAR file containing the driver; note, this can be a semi-colon separated list
+     * of paths
      * @throws DriverLoadException thrown if the driver cannot be loaded
      */
     public static void load(String className, String pathToDriver) throws DriverLoadException {
@@ -111,8 +108,7 @@ public final class DriverLoader {
     }
 
     /**
-     * Loads the specified class using the supplied class loader and registers
-     * the driver with the driver manager.
+     * Loads the specified class using the supplied class loader and registers the driver with the driver manager.
      *
      * @param className the fully qualified name of the desired class
      * @param loader the class loader to use when loading the driver
@@ -122,7 +118,8 @@ public final class DriverLoader {
         try {
             final Class c = loader.loadClass(className);
             final Driver driver = (Driver) c.newInstance();
-            DriverManager.registerDriver(driver);
+            //using the DriverShim to get around the fact that the DriverManager won't register a driver not in the base class path
+            DriverManager.registerDriver(new DriverShim(driver));
         } catch (ClassNotFoundException ex) {
             final String msg = String.format("Unable to load database driver '%s'", className);
             Logger.getLogger(DriverLoader.class.getName()).log(Level.FINE, msg, ex);