From afe8e343b1b5b0abce8675c936ed9aeab934f8c4 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Fri, 10 Jul 2015 05:56:55 -0400 Subject: [PATCH] test code to run on cloudbees to debug a build issue Former-commit-id: b3bba62d28666160682ea15813ea80411f72f9a0 --- .../dependencycheck/data/nvdcve/ConnectionFactory.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java index d787885f1..ecaff3d4a 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java @@ -296,6 +296,9 @@ public final class ConnectionFactory { try { updateFile = String.format(DB_STRUCTURE_UPDATE_RESOURCE, schema); is = ConnectionFactory.class.getClassLoader().getResourceAsStream(updateFile); + if (is == null) { + throw new DatabaseException(String.format("Unable to load update file '%s'", updateFile)); + } reader = new InputStreamReader(is, "UTF-8"); in = new BufferedReader(reader); final StringBuilder sb = new StringBuilder(2110); @@ -342,7 +345,9 @@ public final class ConnectionFactory { rs = cs.executeQuery(); if (rs.next()) { if (!DB_SCHEMA_VERSION.equals(rs.getString(1))) { - LOGGER.debug("Updating from version: " + rs.getString(1)); + LOGGER.error("Current Schema: " + DB_SCHEMA_VERSION); + LOGGER.error("DB Schema: " + rs.getString(1)); + LOGGER.error("-------------------------------------------------------\n\n\n\n\nUpdating from version: " + rs.getString(1) + "\n\n\n\n\n---------------------------------------------------------------------------------"); updateSchema(conn, rs.getString(1)); } } else {