re-add jdbc registration on all paths per #3416

jeremylong · Jun 4, 2021 · a671f2c · a671f2c
1 parent 85ada70
commit a671f2c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DatabaseManager.java b/core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DatabaseManager.java
@@ -514,9 +514,8 @@ private void ensureSchemaVersion(Connection conn) throws DatabaseException {
      */
     public void open() {
         connectionPool = new BasicDataSource();
-        final String driverName = settings.getString(Settings.KEYS.DB_DRIVER_NAME, "");
-        if (!driverName.isEmpty() && !"org.h2.Driver".equals(driverName)) {
-            connectionPool.setDriverClassName(driverName);
+        if (driver != null) {
+            connectionPool.setDriver(driver);
         }
         connectionPool.setUrl(connectionString);
         connectionPool.setUsername(userName);

diff --git a/core/src/main/resources/dependencycheck.properties b/core/src/main/resources/dependencycheck.properties
@@ -44,7 +44,7 @@ data.password=DC-Pass1337!
 # to ensure any and all needed files can be added to the classpath to load the driver.
 # For non-JDBC4 drivers in the classpath only the driver_name needs to be set.
 # For MOST situations these properties likely do not need to be set.
-#data.driver_name=org.h2.Driver
+data.driver_name=org.h2.Driver
 #data.driver_path=
 
 # the class name of the write lock shutdown hook