From be0ccca38dc4ea01bef2d3e7b831ec6b5e430785 Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Mon, 5 Jun 2017 17:48:36 -0400
Subject: [PATCH] Add missing exception rethrow in Case class

---
 Core/src/org/sleuthkit/autopsy/casemodule/Case.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
index df80cf017f..964bd98073 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
@@ -1602,6 +1602,7 @@ public class Case {
                     open(isNewCase, progressIndicator);
                 } catch (CaseActionException ex) {
                     releaseSharedCaseDirLock(getMetadata().getCaseDirectory());
+                    throw ex;
                 }
             }
             return null;
@@ -1716,7 +1717,7 @@ public class Case {
     @Messages({
         "Case.progressMessage.creatingCaseDirectory=Creating case directory...",
         "Case.progressMessage.creatingCaseDatabase=Creating case database...",
-        "Case.exceptionMessage.couldNotCreateCaseDatabase=Failed to create case database.",
+        "# {0} - exception message", "Case.exceptionMessage.couldNotCreateCaseDatabase=Failed to create case database:\n{0}",
         "Case.exceptionMessage.couldNotCreateMetadataFile=Failed to create case metadata file."
     })
     private void createCaseData(ProgressIndicator progressIndicator) throws CaseActionException {
@@ -1754,7 +1755,7 @@ public class Case {
                 metadata.setCaseDatabaseName(caseDb.getDatabaseName());
             }
         } catch (TskCoreException ex) {
-            throw new CaseActionException(Bundle.Case_exceptionMessage_couldNotCreateCaseDatabase(), ex);
+            throw new CaseActionException(Bundle.Case_exceptionMessage_couldNotCreateCaseDatabase(ex.getLocalizedMessage()), ex);
         } catch (UserPreferencesException ex) {
             throw new CaseActionException(NbBundle.getMessage(Case.class, "Case.databaseConnectionInfo.error.msg"), ex);
         } catch (CaseMetadataException ex) {