Using KeyValueStorage.Batch more rigorously

Author: StevenLuMT

bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/EntryLocationIndex.java

@@ -148,9 +148,12 @@ private long getLastEntryInLedgerInternal(long ledgerId) throws IOException {
 
     public void addLocation(long ledgerId, long entryId, long location) throws IOException {
         Batch batch = locationsDb.newBatch();
-        addLocation(batch, ledgerId, entryId, location);
-        batch.flush();
-        batch.close();
+        try {
+            addLocation(batch, ledgerId, entryId, location);
+            batch.flush();
+        } finally {
+            batch.close();
+        }
     }
 
     public Batch newBatch() {
@@ -179,17 +182,19 @@ public void updateLocations(Iterable<EntryLocation> newLocations) throws IOExcep
         }
 
         Batch batch = newBatch();
-        // Update all the ledger index pages with the new locations
-        for (EntryLocation e : newLocations) {
-            if (log.isDebugEnabled()) {
-                log.debug("Update location - ledger: {} -- entry: {}", e.ledger, e.entry);
-            }
+        try {
+            // Update all the ledger index pages with the new locations
+            for (EntryLocation e : newLocations) {
+                if (log.isDebugEnabled()) {
+                    log.debug("Update location - ledger: {} -- entry: {}", e.ledger, e.entry);
+                }
 
-            addLocation(batch, e.ledger, e.entry, e.location);
+                addLocation(batch, e.ledger, e.entry, e.location);
+            }
+            batch.flush();
+        } finally {
+            batch.close();
         }
-
-        batch.flush();
-        batch.close();
     }
 
     public void delete(long ledgerId) throws IOException {