From 3d086ed97d3603941c3f5af32d48785b03448c99 Mon Sep 17 00:00:00 2001
From: William Schaefer <wschaefer@basistech.net>
Date: Tue, 5 Dec 2017 17:23:22 -0500
Subject: [PATCH] 2999 ensure lock is always release in AddRawImageTask

---
 .../autopsy/datasourceprocessors/AddRawImageTask.java | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/datasourceprocessors/AddRawImageTask.java b/Core/src/org/sleuthkit/autopsy/datasourceprocessors/AddRawImageTask.java
index 6895615bba..14a3dc9e2f 100755
--- a/Core/src/org/sleuthkit/autopsy/datasourceprocessors/AddRawImageTask.java
+++ b/Core/src/org/sleuthkit/autopsy/datasourceprocessors/AddRawImageTask.java
@@ -126,8 +126,6 @@ final class AddRawImageTask implements Runnable {
         progressMonitor.setProgressText(Bundle.AddRawImageTask_progress_add_text() + imageFilePath);
         List<String> imageFilePaths = new ArrayList<>();
         SleuthkitCase caseDatabase = Case.getCurrentCase().getSleuthkitCase();
-        caseDatabase.acquireSingleUserCaseWriteLock();
-
         File imageFile = Paths.get(imageFilePath).toFile();
         if (!imageFile.exists()) {
             String errorMessage = Bundle.AddRawImageTask_image_critical_error_adding() + imageFilePath + Bundle.AddRawImageTask_for_device() 
@@ -136,11 +134,10 @@ final class AddRawImageTask implements Runnable {
             logger.log(Level.SEVERE, errorMessage);
             criticalErrorOccurred = true;
             return;
-        }
-
-        imageFilePaths.add(imageFilePath);
-        
-        try {
+        }        
+        imageFilePaths.add(imageFilePath); 
+        try { 
+            caseDatabase.acquireSingleUserCaseWriteLock();
             /*
              * Get Image that will be added to case
              */