Added close() calls into catch block, in the event it fails afterLoad…

… will be invoked
martijnvg · Mar 25, 2014 · b2bd806 · b2bd806
1 parent 2f6f550
commit b2bd806
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java
@@ -139,13 +139,16 @@ public ParentChildAtomicFieldData loadDirect(AtomicReaderContext context) throws
                 success = true;
                 return data;
             } finally {
-                for (ObjectObjectCursor<String, TypeBuilder> cursor : typeBuilders) {
-                    cursor.value.builder.close();
-                }
-                if (success) {
-                    estimator.afterLoad(estimatedTermsEnum, data.getMemorySizeInBytes());
-                } else {
-                    estimator.afterLoad(estimatedTermsEnum, 0);
+                try {
+                    for (ObjectObjectCursor<String, TypeBuilder> cursor : typeBuilders) {
+                        cursor.value.builder.close();
+                    }
+                } finally {
+                    if (success) {
+                        estimator.afterLoad(estimatedTermsEnum, data.getMemorySizeInBytes());
+                    } else {
+                        estimator.afterLoad(estimatedTermsEnum, 0);
+                    }
                 }
             }
         }