Fix for leaking mongodb cursor

unidev-polydata · Jan 18, 2023 · a1ff525 · a1ff525
1 parent eeba1a6
commit a1ff525
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/polydata-mongodb/src/main/java/com/unidev/polydata4/mongodb/PolydataMongodb.java b/polydata-mongodb/src/main/java/com/unidev/polydata4/mongodb/PolydataMongodb.java
@@ -211,10 +211,12 @@ public BasicPolyList read(String poly, Set<String> ids) {
 
         final BasicPolyList dbPolys = new BasicPolyList();
         Bson query = Filters.in(_ID, ids);
-        collection(poly).find(query).iterator().forEachRemaining(document -> {
-            BasicPoly polyData = toPoly(document);
-            dbPolys.add(polyData);
-        });
+        try (MongoCursor<Document> cursor = collection(poly).find(query).iterator()) {
+            cursor.forEachRemaining(document -> {
+                BasicPoly polyData = toPoly(document);
+                dbPolys.add(polyData);
+            });
+        }
         if (cache.isPresent()) {
             Cache cacheInstance = cache.get();
             for (BasicPoly polyData : dbPolys.list()) {
@@ -444,8 +446,10 @@ private void recalculateIndex(String poly) {
                 indexData.put("poly", poly);
                 indexes.add(indexData);
             }
-            indexCollection(poly).drop();
-            indexCollection(poly).insertMany(indexes.stream().map(this::toDocument).collect(Collectors.toList()));
+            if (!indexes.isEmpty()) {
+                indexCollection(poly).drop();
+                indexCollection(poly).insertMany(indexes.stream().map(this::toDocument).collect(Collectors.toList()));
+            }
         }
     }