github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-18 15:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added DriverShim to get around issue with loading drivers via URLClassLoader

Browse Source 
Former-commit-id: 9aac9909503c01e2b41261556252e550a3253005
This commit is contained in:
Jeremy Long
2014-01-13 06:53:39 -05:00
parent 3eae185ae2
commit e60ec5df3c
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverLoader.java
View File

@@ -45,8 +45,7 @@ public final class DriverLoader {
} }
/** /**
* Loads the specified class using the system class loader and registers the * Loads the specified class using the system class loader and registers the driver with the driver manager.
* driver with the driver manager.
* *
* @param className the fully qualified name of the desired class * @param className the fully qualified name of the desired class
* @throws DriverLoadException thrown if the driver cannot be loaded * @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 * Loads the specified class by registering the supplied paths to the class loader and then registers the driver
* loader and then registers the driver with the driver manager. The * with the driver manager. The pathToDriver argument is added to the class loader so that an external driver can be
* pathToDriver argument is added to the class loader so that an external * loaded. Note, the pathTodriver can contain a semi-colon separated list of paths so any dependencies can be added
* driver can be loaded. Note, the pathTodriver can contain a semi-colon * as needed. If a path in the pathToDriver argument is a directory all files in the directory are added to the
* separated list of paths so any dependencies can be added as needed. If a * class path.
* 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 className the fully qualified name of the desired class
* @param pathToDriver the path to the JAR file containing the driver; note, * @param pathToDriver the path to the JAR file containing the driver; note, this can be a semi-colon separated list
* this can be a semi-colon separated list of paths * of paths
* @throws DriverLoadException thrown if the driver cannot be loaded * @throws DriverLoadException thrown if the driver cannot be loaded
*/ */
public static void load(String className, String pathToDriver) throws DriverLoadException { 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 * Loads the specified class using the supplied class loader and registers the driver with the driver manager.
* the driver with the driver manager.
* *
* @param className the fully qualified name of the desired class * @param className the fully qualified name of the desired class
* @param loader the class loader to use when loading the driver * @param loader the class loader to use when loading the driver
@@ -122,7 +118,8 @@ public final class DriverLoader {
try { try {
final Class c = loader.loadClass(className); final Class c = loader.loadClass(className);
final Driver driver = (Driver) c.newInstance(); 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) { } catch (ClassNotFoundException ex) {
final String msg = String.format("Unable to load database driver '%s'", className); final String msg = String.format("Unable to load database driver '%s'", className);
Logger.getLogger(DriverLoader.class.getName()).log(Level.FINE, msg, ex); Logger.getLogger(DriverLoader.class.getName()).log(Level.FINE, msg, ex);