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

Cleanup: Ease debugging connection problems: add cause to thrown exceptions

Browse Source
This commit is contained in:
Stefan Neuhaus
2017-07-13 21:18:27 +02:00
parent fccac8cb85
commit d7d5e0c757
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,7 +117,7 @@ public final class ConnectionFactory {
}
} catch (DriverLoadException ex) {
LOGGER.debug("Unable to load database driver", ex);
throw new DatabaseException("Unable to load database driver");
throw new DatabaseException("Unable to load database driver", ex);
}
}
userName = Settings.getString(Settings.KEYS.DB_USER, "dcuser");
@@ -130,7 +130,7 @@ public final class ConnectionFactory {
} catch (IOException ex) {
LOGGER.debug(
"Unable to retrieve the database connection string", ex);
throw new DatabaseException("Unable to retrieve the database connection string");
throw new DatabaseException("Unable to retrieve the database connection string", ex);
}
boolean shouldCreateSchema = false;
try {
@@ -140,7 +140,7 @@ public final class ConnectionFactory {
}
} catch (IOException ioex) {
LOGGER.debug("Unable to verify database exists", ioex);
throw new DatabaseException("Unable to verify database exists");
throw new DatabaseException("Unable to verify database exists", ioex);
}
LOGGER.debug("Loading database connection");
LOGGER.debug("Connection String: {}", connectionString);
@@ -157,11 +157,11 @@ public final class ConnectionFactory {
LOGGER.debug("Unable to start the database in server mode; reverting to single user mode");
} catch (SQLException sqlex) {
LOGGER.debug("Unable to connect to the database", ex);
throw new DatabaseException("Unable to connect to the database");
throw new DatabaseException("Unable to connect to the database", ex);
}
} else {
LOGGER.debug("Unable to connect to the database", ex);
throw new DatabaseException("Unable to connect to the database");
throw new DatabaseException("Unable to connect to the database", ex);
}
}
@@ -170,7 +170,7 @@ public final class ConnectionFactory {
createTables(conn);
} catch (DatabaseException dex) {
LOGGER.debug("", dex);
throw new DatabaseException("Unable to create the database structure");
throw new DatabaseException("Unable to create the database structure", dex);
}
}
try {
@@ -228,7 +228,7 @@ public final class ConnectionFactory {
conn = DriverManager.getConnection(connectionString, userName, password);
} catch (SQLException ex) {
LOGGER.debug("", ex);
throw new DatabaseException("Unable to connect to the database");
throw new DatabaseException("Unable to connect to the database", ex);
}
return conn;
}
@@ -317,7 +317,7 @@ public final class ConnectionFactory {
try {
databaseProductName = conn.getMetaData().getDatabaseProductName();
} catch (SQLException ex) {
throw new DatabaseException("Unable to get the database product name");
throw new DatabaseException("Unable to get the database product name", ex);
}
if ("h2".equalsIgnoreCase(databaseProductName)) {
LOGGER.debug("Updating database structure");
@@ -412,7 +412,7 @@ public final class ConnectionFactory {
}
} catch (SQLException ex) {
LOGGER.debug("", ex);
throw new DatabaseException("Unable to check the database schema version");
throw new DatabaseException("Unable to check the database schema version", ex);
} finally {
DBUtils.closeResultSet(rs);
DBUtils.closeStatement(ps);