From dfeeb60367ee7a06a5ed1494a165013e66a0f06b Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Tue, 2 Jul 2019 13:53:29 -0400 Subject: [PATCH] Address codacy errors and netbeans suggestions in FileExportRuleSet.java, array now coppied --- .../autoingest/FileExportRuleSet.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/FileExportRuleSet.java b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/FileExportRuleSet.java index 4a098762ff..1f5822c973 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/FileExportRuleSet.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/FileExportRuleSet.java @@ -48,7 +48,7 @@ final class FileExportRuleSet implements Serializable, Comparable rules; + private final Map rules; /** * Constructs an empty named set of uniquely named rules. @@ -390,13 +390,18 @@ final class FileExportRuleSet implements Serializable, Comparable evaluate(long dataSourceId) throws ExportRulesException { try { SleuthkitCase db = Case.getCurrentCaseThrows().getSleuthkitCase(); + ResultSet resultSet = null; try (SleuthkitCase.CaseDbQuery queryResult = db.executeQuery(getQuery(dataSourceId))) { - ResultSet resultSet = queryResult.getResultSet(); + resultSet = queryResult.getResultSet(); List fileIds = new ArrayList<>(); while (resultSet.next()) { fileIds.add(resultSet.getLong("obj_id")); } return fileIds; + } finally { + if (resultSet != null) { + resultSet.close(); + } } } catch (NoCurrentCaseException ex) { throw new ExportRulesException("No current case", ex); @@ -922,7 +927,7 @@ final class FileExportRuleSet implements Serializable, Comparable