ensure an erroring merge task is fully undone on exception but refres…

…h the Shepherd for the next task to proceed
WildMeOrg · Feb 21, 2025 · 38e85ef · 38e85ef
1 parent a3f9074
commit 38e85ef
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/org/ecocean/scheduled/ScheduledIndividualMerge.java b/src/main/java/org/ecocean/scheduled/ScheduledIndividualMerge.java
@@ -46,8 +46,12 @@ public ScheduledIndividualMerge(MarkedIndividual primaryIndividual,
 
         } catch (Exception e) {
             this.setTaskIncomplete();
+            //rollback this Shepherd to unwind this task and re-open the Shepherd in case it is being reused by a subsequent Task
+            myShepherd.rollbackDBTransaction();
+            myShepherd.beginDBTransaction();
             e.printStackTrace();
-        } 
+        }
+
     }
 
     private void mergeIndividuals(MarkedIndividual primaryIndividual,