Few stability improvements for deleting joined items

.gitignore

@@ -19,3 +19,6 @@ jobreport*csv
 /profiles/test/config.properties
 /profiles/prod/config.properties
 dependency-reduced-pom.xml
+DataShot.iml
+DataShot-*.jar
+imagecapture*.log

pom.xml

@@ -1,5 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" 
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="https://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>edu.harvard.mcz</groupId>
 	<artifactId>DataShot</artifactId>
@@ -95,12 +95,12 @@
 		<repository>
 			<id>central</id>
 			<name>Maven Central</name>
-			<url>http://repo1.maven.org/maven2/</url>
+			<url>https://repo1.maven.org/maven2/</url>
 		</repository>
 		<repository>
 			<id>jeecg</id>
 			<name>JEECG</name>
-			<url>http://maven.jeecg.org/nexus/content/repositories/jeecg/</url>
+			<url>https://maven.jeecg.org/nexus/content/repositories/jeecg/</url>
 		</repository>
 	</repositories>
 	<dependencies>
@@ -248,15 +248,15 @@
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-ehcache</artifactId>
-			<version>5.3.0.Beta1</version>
+			<version>5.4.10.Final</version>
 		</dependency>
 		<dependency>
 			<!-- TODO -->
 			<!--<groupId>org.hibernate.orm</groupId>-->
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-core</artifactId>
 			<!--<version>6.0.0.Alpha2</version>-->
-			<version>5.4.4.Final</version>
+			<version>5.4.11.Final</version>
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.json/json -->
 		<dependency>

src/main/java/edu/harvard/mcz/imagecapture/SpecimenController.java

@@ -232,6 +232,14 @@ public boolean hasPreviousSpecimenInTable() {
         return result;
     }
 
+    public boolean setSpecimen(Specimen aSpecimen) {
+        if (aSpecimen != null) {
+            specimen = aSpecimen;
+            return true;
+        }
+        return false;
+    }
+
     public boolean setSpecimen(Long aSpecimenID) throws NoSuchRecordException {
         boolean result = false;
         SpecimenLifeCycle sls = new SpecimenLifeCycle();
@@ -270,7 +278,10 @@ public boolean save() throws SaveFailedException {
         // reload the specimen
         // Why??? Because we can. Also, to kinda show if more than one
         // user edited the same species
-        specimen = s.findById(specimen.getSpecimenId());
+        Specimen updatedSpecimen = s.findById(specimen.getSpecimenId());
+        if (updatedSpecimen != null) {
+            specimen = updatedSpecimen;
+        }
         return result;
     }
 

src/main/java/edu/harvard/mcz/imagecapture/entity/Specimen.hbm.xml

@@ -236,13 +236,13 @@
             </key>
             <one-to-many class="edu.harvard.mcz.imagecapture.entity.SpecimenPart"/>
         </set>
-        <set name="LatLong" cascade="all-delete-orphan" fetch="subselect">
+        <set name="LatLong" cascade="all" fetch="subselect">
             <key>
                 <column name="SpecimenId"/>
             </key>
             <one-to-many class="edu.harvard.mcz.imagecapture.entity.LatLong"/>
         </set>
-        <set name="externalHistory" cascade="all-delete-orphan" fetch="subselect">
+        <set name="externalHistory" cascade="all" fetch="subselect">
             <key>
                 <column name="SpecimenId"/>
             </key>