Fix minor possible issue

BernhardWebstudio · Nov 7, 2023 · 8a971b9 · 8a971b9
1 parent e66ac38
commit 8a971b9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/edu/harvard/mcz/imagecapture/data/HibernateUtil.java b/src/main/java/edu/harvard/mcz/imagecapture/data/HibernateUtil.java
@@ -212,7 +212,9 @@ private static void createSessionFactory() {
             // Make sure you log the exception, as it might be swallowed
             ex.printStackTrace();
             System.out.println("Initial SessionFactory creation failed." + ex);
-            System.out.println("Cause" + ex.getCause().getMessage());
+            if (ex.getCause() != null) {
+                System.out.println("Cause" + ex.getCause().getMessage());
+            }
             throw new ExceptionInInitializerError(ex);
         }
     }

diff --git a/src/main/java/edu/harvard/mcz/imagecapture/ui/dialog/NahimaDrawerExportDialog.java b/src/main/java/edu/harvard/mcz/imagecapture/ui/dialog/NahimaDrawerExportDialog.java
@@ -21,10 +21,8 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashSet;
+import java.util.*;
 import java.util.List;
-import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -165,7 +163,7 @@ private Specimen translateFile(File file) {
             // if drawer found, can create the data based on the CSV file
             specimen.setBarcode("Schulthess Drawer " + matcher.group(1));
             List<Map<String, String>> relevantCsvRows = this.csvContent.stream().filter(row -> Integer.parseInt(row.get("Drawer")) == drawerNumber).collect(Collectors.toList());
-            HashSet<String> relevantTags = new HashSet<>();
+            Set<String> relevantTags = new LinkedHashSet<>();
             //
             String[] firstOrderCols = new String[]{
                     "Suborder", "Family", "Subfamily", "Tribe",