From 96ed64161d95245e20feac180bb2df314a8bdd21 Mon Sep 17 00:00:00 2001 From: Mark McKinnon Date: Mon, 15 Jul 2019 20:18:06 -0400 Subject: [PATCH] Update ImageNode.java Update comments from 2409 that were carried over. --- Core/src/org/sleuthkit/autopsy/datamodel/ImageNode.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ImageNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/ImageNode.java index d5d5d1bd04..dbfa44e207 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ImageNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ImageNode.java @@ -205,7 +205,7 @@ public class ImageNode extends AbstractContentNode { } private Boolean checkSchemaVersion() { - String sqlStatement = "SELECT a.value creationMajorVersion, b.value creationMinorVersion FROM tsk_db_info_extended a, tsk_db_info_extended b " + + String sqlStatement = "SELECT a.value AS creationMajorVersion, b.value AS creationMinorVersion FROM tsk_db_info_extended a, tsk_db_info_extended b " + " WHERE a.name = 'CREATION_SCHEMA_MAJOR_VERSION' and b.name = 'CREATION_SCHEMA_MINOR_VERSION';"; try (CaseDbQuery query = Case.getCurrentCaseThrows().getSleuthkitCase().executeQuery(sqlStatement);) { ResultSet schemaVersion = query.getResultSet(); @@ -213,11 +213,9 @@ public class ImageNode extends AbstractContentNode { int creationMajorVersion = schemaVersion.getInt("creationMajorVersion"); int creationMinorVersion = schemaVersion.getInt("creationMinorVersion"); if ((creationMajorVersion == 8 && creationMinorVersion >= 3) || creationMajorVersion > 8) { - schemaVersion.close(); return true; } } - schemaVersion.close(); } catch (SQLException | TskCoreException | NoCurrentCaseException ex) { logger.log(Level.SEVERE, "Failed to get the Create Major and Minor Schema Versions", ex); }