From 42a9f864eb4016b44940cc211f4f2008dc2239c5 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Thu, 23 Jan 2014 21:25:59 -0500 Subject: [PATCH] bug fixes for issue #49 Former-commit-id: a5c7236f6d1663dc3004161d6e9e1d68a7bc6f06 --- .../org/owasp/dependencycheck/data/nvdcve/DriverLoader.java | 2 +- .../main/java/org/owasp/dependencycheck/utils/Settings.java | 3 +-- 2 files changed, 2 insertions(+), 3 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 5151aedb0..07ab2e46f 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 @@ -50,7 +50,7 @@ public final class DriverLoader { * @throws DriverLoadException thrown if the driver cannot be loaded */ public static void load(String className) throws DriverLoadException { - final ClassLoader loader = ClassLoader.getSystemClassLoader(); + final ClassLoader loader = DriverLoader.class.getClassLoader(); //ClassLoader.getSystemClassLoader(); load(className, loader); } diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Settings.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Settings.java index db57f52bf..b8d2a523e 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Settings.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Settings.java @@ -284,8 +284,7 @@ public final class Settings { Logger.getLogger(Settings.class.getName()).log(Level.FINE, "Settings.getDataFile() - transforming filename"); final File jarPath = getJarPath(); Logger.getLogger(Settings.class.getName()).log(Level.FINE, String.format("Settings.getDataFile() - jar file: '%s'", jarPath.toString())); - final File newBase = new File(jarPath, file.substring(6)); - File retVal = new File(newBase, file); + final File retVal = new File(jarPath, file.substring(6)); Logger.getLogger(Settings.class.getName()).log(Level.FINE, String.format("Settings.getDataFile() - returning: '%s'", retVal.toString())); return retVal; }