Update ImageNode.java

Update comments from 2409 that were carried over.
This commit is contained in:
Mark McKinnon 2019-07-15 20:18:06 -04:00
parent 249ed24456
commit 96ed64161d

View File

@ -205,7 +205,7 @@ public class ImageNode extends AbstractContentNode<Image> {
} }
private Boolean checkSchemaVersion() { 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';"; " WHERE a.name = 'CREATION_SCHEMA_MAJOR_VERSION' and b.name = 'CREATION_SCHEMA_MINOR_VERSION';";
try (CaseDbQuery query = Case.getCurrentCaseThrows().getSleuthkitCase().executeQuery(sqlStatement);) { try (CaseDbQuery query = Case.getCurrentCaseThrows().getSleuthkitCase().executeQuery(sqlStatement);) {
ResultSet schemaVersion = query.getResultSet(); ResultSet schemaVersion = query.getResultSet();
@ -213,11 +213,9 @@ public class ImageNode extends AbstractContentNode<Image> {
int creationMajorVersion = schemaVersion.getInt("creationMajorVersion"); int creationMajorVersion = schemaVersion.getInt("creationMajorVersion");
int creationMinorVersion = schemaVersion.getInt("creationMinorVersion"); int creationMinorVersion = schemaVersion.getInt("creationMinorVersion");
if ((creationMajorVersion == 8 && creationMinorVersion >= 3) || creationMajorVersion > 8) { if ((creationMajorVersion == 8 && creationMinorVersion >= 3) || creationMajorVersion > 8) {
schemaVersion.close();
return true; return true;
} }
} }
schemaVersion.close();
} catch (SQLException | TskCoreException | NoCurrentCaseException ex) { } catch (SQLException | TskCoreException | NoCurrentCaseException ex) {
logger.log(Level.SEVERE, "Failed to get the Create Major and Minor Schema Versions", ex); logger.log(Level.SEVERE, "Failed to get the Create Major and Minor Schema Versions", ex);
} }