From e9229a20fc91eaecfd57536b27fc1e9989e2e61c Mon Sep 17 00:00:00 2001
From: Mark McKinnon <mark.mckinnon@davenport.edu>
Date: Mon, 21 Oct 2019 13:19:58 -0400
Subject: [PATCH] Updare for Exception handling

Update for exception handling.
---
 .../src/org/sleuthkit/autopsy/keywordsearch/Server.java         | 2 +-
 .../org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
index b886e5eb71..dae1bae943 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
@@ -1277,7 +1277,7 @@ public class Server {
      *
      * @throws NoOpenCoreException
      */
-    private void deleteDataSource(Long dataSourceId) throws SolrServerException, KeywordSearchModuleException, NoOpenCoreException, IOException {
+    public void deleteDataSource(Long dataSourceId) throws SolrServerException, KeywordSearchModuleException, NoOpenCoreException, IOException {
         currentCoreLock.writeLock().lock();
         if (null == currentCore) {
             throw new NoOpenCoreException();
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java
index 804c8557d7..13eb75907f 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java
@@ -208,7 +208,7 @@ public class SolrSearchService implements KeywordSearchService, AutopsyService {
     public void deleteDataSource(Long dataSourceId) throws KeywordSearchServiceException {
         try {
             KeywordSearch.getServer().deleteDataSource(dataSourceId);
-        } catch (NoOpenCoreException | KeywordSearchModuleException ex) {
+        } catch (NoOpenCoreException | KeywordSearchModuleException | SolrServerException | IOException ex) {
             throw new KeywordSearchServiceException(NbBundle.getMessage(SolrSearchService.class,
                     "SolrSearchService.deleteDataSource.exceptionMessage.noCurrentSolrCore"));
         }