Ensure proper childTask storage

WildMeOrg · Oct 29, 2024 · 5d38850 · 5d38850
1 parent 483d0bd
commit 5d38850
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/src/main/java/org/ecocean/identity/IBEISIA.java b/src/main/java/org/ecocean/identity/IBEISIA.java
@@ -2090,14 +2090,11 @@ public static JSONObject processCallback(String taskID, JSONObject resp, String
                     myShepherd.storeNewTask(subParentTask);
                     myShepherd.updateDBTransaction();
 
-                    Task task = IA.intakeAnnotations(myShepherd2, annots, subParentTask, false);
-                    // Here is a place we check downstream. IA.intakeAnnotations() will check the anns vs the identification classes in IA.properties,
-                    // and return null if nobody was valid.
-                    if (task != null) {
-                        rtn.put("identificationTaskId", task.getId());
-                        if (subParentTask != null) subParentTask.addChild(task);
-                        myShepherd2.storeNewTask(task);
-                    }
+                    Task childTask = IA.intakeAnnotations(myShepherd2, annots, subParentTask, false);
+  	              	myShepherd.storeNewTask(childTask);
+  	              	myShepherd.updateDBTransaction();
+  	              	subParentTask.addChild(childTask);
+  	              	myShepherd.updateDBTransaction();
 
             	}
 
@@ -2108,7 +2105,7 @@ public static JSONObject processCallback(String taskID, JSONObject resp, String
                     "[INFO]: No annotations were suitable for identification. Check resulting identification class(es).");
                 myShepherd2.rollbackDBTransaction();
             }
-            myShepherd2.closeDBTransaction();
+            myShepherd2.rollbackAndClose();
         }
         return rtn;
     }