From f7dc2d34f64f012cfdba7a3f3762b7d3392e792e Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Sun, 7 Apr 2019 21:16:37 -0400 Subject: [PATCH] Refinements/fixes for 'standard' admin case deletion --- .../autopsy/experimental/autoingest/DeleteCaseTask.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/DeleteCaseTask.java b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/DeleteCaseTask.java index 5b1ef517e6..4973e4df30 100755 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/DeleteCaseTask.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/DeleteCaseTask.java @@ -427,7 +427,7 @@ final class DeleteCaseTask implements Runnable { } } checkForCancellation(); - if (deleteOption == DeleteOptions.DELETE_OUTPUT || deleteOption == DeleteOptions.DELETE_INPUT_AND_OUTPUT) { + if (deleteOption == DeleteOptions.DELETE_OUTPUT || deleteOption == DeleteOptions.DELETE_INPUT_AND_OUTPUT || deleteOption == DeleteOptions.DELETE_CASE) { Case.deleteMultiUserCase(caseNodeData, caseMetadata, progress, logger); } @@ -663,7 +663,7 @@ final class DeleteCaseTask implements Runnable { * coordination service operation to complete. */ private void deleteCaseResourcesNode() throws InterruptedException { - if (deleteOption == DeleteOptions.DELETE_OUTPUT || deleteOption == DeleteOptions.DELETE_INPUT_AND_OUTPUT) { + if (deleteOption == DeleteOptions.DELETE_OUTPUT || deleteOption == DeleteOptions.DELETE_INPUT_AND_OUTPUT || deleteOption == DeleteOptions.DELETE_CASE) { progress.progress(Bundle.DeleteCaseTask_progress_deletingResourcesLockNode()); logger.log(Level.INFO, String.format("Deleting case resources log znode for %s", caseNodeData.getDisplayName())); String resourcesNodePath = CoordinationServiceUtils.getCaseResourcesNodePath(caseNodeData.getDirectory()); @@ -685,7 +685,7 @@ final class DeleteCaseTask implements Runnable { * coordination service operation to complete. */ private void deleteCaseAutoIngestLogNode() throws InterruptedException { - if (deleteOption == DeleteOptions.DELETE_OUTPUT || deleteOption == DeleteOptions.DELETE_INPUT_AND_OUTPUT) { + if (deleteOption == DeleteOptions.DELETE_OUTPUT || deleteOption == DeleteOptions.DELETE_INPUT_AND_OUTPUT || deleteOption == DeleteOptions.DELETE_CASE) { progress.progress(Bundle.DeleteCaseTask_progress_deletingJobLogLockNode()); logger.log(Level.INFO, String.format("Deleting case auto ingest job log znode for %s", caseNodeData.getDisplayName())); String logFilePath = CoordinationServiceUtils.getCaseAutoIngestLogNodePath(caseNodeData.getDirectory()); @@ -739,7 +739,7 @@ final class DeleteCaseTask implements Runnable { * coordination service operation to complete. */ private void deleteCaseNameNode() throws InterruptedException { - if (deleteOption == DeleteOptions.DELETE_OUTPUT || deleteOption == DeleteOptions.DELETE_INPUT_AND_OUTPUT) { + if (deleteOption == DeleteOptions.DELETE_OUTPUT || deleteOption == DeleteOptions.DELETE_INPUT_AND_OUTPUT || deleteOption == DeleteOptions.DELETE_CASE) { progress.progress(Bundle.DeleteCaseTask_progress_deletingCaseNameCoordSvcNode()); logger.log(Level.INFO, String.format("Deleting case name znode for %s", caseNodeData.getDisplayName())); try {