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

reverted change to resolve issue #930

Browse Source
This commit is contained in:
Jeremy Long
2017-10-16 06:55:45 -04:00
parent 0b3a50f320
commit 60fd4f6311
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,7 @@ import java.sql.DriverManager;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import java.util.logging.Level;
import javax.annotation.concurrent.ThreadSafe; import javax.annotation.concurrent.ThreadSafe;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.owasp.dependencycheck.utils.DBUtils; import org.owasp.dependencycheck.utils.DBUtils;
@@ -116,15 +117,17 @@ public final class ConnectionFactory {
//load the driver if necessary //load the driver if necessary
final String driverName = settings.getString(Settings.KEYS.DB_DRIVER_NAME, ""); final String driverName = settings.getString(Settings.KEYS.DB_DRIVER_NAME, "");
final String driverPath = settings.getString(Settings.KEYS.DB_DRIVER_PATH, ""); final String driverPath = settings.getString(Settings.KEYS.DB_DRIVER_PATH, "");
if (!driverPath.isEmpty()) { LOGGER.debug("Loading driver '{}'", driverName);
LOGGER.debug("Loading driver '{}' from '{}'", driverName, driverPath); try {
try { if (!driverPath.isEmpty()) {
LOGGER.debug("Loading driver from: {}", driverPath); LOGGER.debug("Loading driver from: {}", driverPath);
driver = DriverLoader.load(driverName, driverPath); driver = DriverLoader.load(driverName, driverPath);
} catch (DriverLoadException ex) { } else {
LOGGER.debug("Unable to load database driver", ex); driver = DriverLoader.load(driverName);
throw new DatabaseException("Unable to load database driver", ex);
} }
} catch (DriverLoadException ex) {
LOGGER.debug("Unable to load database driver", ex);
throw new DatabaseException("Unable to load database driver", ex);
} }
userName = settings.getString(Settings.KEYS.DB_USER, "dcuser"); userName = settings.getString(Settings.KEYS.DB_USER, "dcuser");
//yes, yes - hard-coded password - only if there isn't one in the properties file. //yes, yes - hard-coded password - only if there isn't one in the properties file.
@@ -134,10 +137,10 @@ public final class ConnectionFactory {
Settings.KEYS.DB_CONNECTION_STRING, Settings.KEYS.DB_CONNECTION_STRING,
Settings.KEYS.DB_FILE_NAME); Settings.KEYS.DB_FILE_NAME);
} catch (IOException ex) { } catch (IOException ex) {
LOGGER.debug( LOGGER.debug("Unable to retrieve the database connection string", ex);
"Unable to retrieve the database connection string", ex);
throw new DatabaseException("Unable to retrieve the database connection string", ex); throw new DatabaseException("Unable to retrieve the database connection string", ex);
} }
boolean shouldCreateSchema = false; boolean shouldCreateSchema = false;
try { try {
if (connectionString.startsWith("jdbc:h2:file:")) { //H2 if (connectionString.startsWith("jdbc:h2:file:")) { //H2