try/finally in createJob

CDLUC3 · Jun 14, 2024 · f22370a · f22370a
1 parent 6f45397
commit f22370a
Showing 1 changed file with 17 additions and 14 deletions.
diff --git a/src/main/java/org/cdlib/mrt/zk/Job.java b/src/main/java/org/cdlib/mrt/zk/Job.java
@@ -201,22 +201,25 @@ public static Job createJob(ZooKeeper client, String bid, int priority, JSONObje
     if (!job.lock(client)) {
       return null;
     }
-    job.createData(client, ZKKey.JOB_BID, bid);
-    job.createData(client, ZKKey.JOB_PRIORITY, job.priority);
-    job.createData(client, ZKKey.JOB_SPACE_NEEDED, job.spaceNeeded);
-    job.createData(client, ZKKey.JOB_CONFIGURATION, configuration);
+    try {
+      job.createData(client, ZKKey.JOB_BID, bid);
+      job.createData(client, ZKKey.JOB_PRIORITY, job.priority);
+      job.createData(client, ZKKey.JOB_SPACE_NEEDED, job.spaceNeeded);
+      job.createData(client, ZKKey.JOB_CONFIGURATION, configuration);
 
-    if (!identifiers.isEmpty()) {
-      job.setIdentifiers(client, identifiers);
-    }
-    if (!metadata.isEmpty()) {
-      job.setMetadata(client, metadata);
+      if (!identifiers.isEmpty()) {
+        job.setIdentifiers(client, identifiers);
+      }
+      if (!metadata.isEmpty()) {
+        job.setMetadata(client, metadata);
+      }
+      job.setStatusWithPriority(client, Job.initStatus(), priority);
+      job.setBatchStatePath(client);
+      job.setJobStatePath(client);
+      return job;
+    } finally {
+      job.unlock(client);
     }
-    job.setStatusWithPriority(client, Job.initStatus(), priority);
-    job.setBatchStatePath(client);
-    job.setJobStatePath(client);
-    job.unlock(client);
-    return job;
   }
 
   public JSONObject statusObject(IngestState status) {