From f22370a5e622a8ff1c47d4fb9b95b3633a75fd85 Mon Sep 17 00:00:00 2001
From: Terry Brady <terrence.brady@ucop.edu>
Date: Fri, 14 Jun 2024 11:54:54 -0700
Subject: [PATCH] try/finally in createJob

---
 src/main/java/org/cdlib/mrt/zk/Job.java | 31 ++++++++++++++-----------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/main/java/org/cdlib/mrt/zk/Job.java b/src/main/java/org/cdlib/mrt/zk/Job.java
index fd38d67..c57aafa 100644
--- 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) {