This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-11500 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 91ce7801d57c81a71c1c5dc10ca2adbd6d641970 Author: Julian Reschke <[email protected]> AuthorDate: Tue Mar 4 10:53:44 2025 +0100 OAK-11500: fix change in MongoDocumentStore --- .../oak/plugins/blob/AbstractSharedCachingDataStore.java | 10 +++------- .../oak/plugins/document/mongo/MongoDocumentStore.java | 4 +++- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/AbstractSharedCachingDataStore.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/AbstractSharedCachingDataStore.java index dcd57525b4..d70f847b43 100644 --- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/AbstractSharedCachingDataStore.java +++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/AbstractSharedCachingDataStore.java @@ -326,15 +326,11 @@ public abstract class AbstractSharedCachingDataStore extends AbstractDataStore try { // If cache configured to 0 will return null if (cached == null || !cached.exists()) { - InputStream in = null; - try { - TransientFileFactory fileFactory = TransientFileFactory.getInstance(); - File tmpFile = fileFactory.createTransientFile("temp0cache", null, temp); - in = backend.getRecord(getIdentifier()).getStream(); + TransientFileFactory fileFactory = TransientFileFactory.getInstance(); + File tmpFile = fileFactory.createTransientFile("temp0cache", null, temp); + try (InputStream in = backend.getRecord(getIdentifier()).getStream()) { copyInputStreamToFile(in, tmpFile); return new LazyFileInputStream(tmpFile); - } finally { - in.close(); } } else { return new FileInputStream(cached); diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java index 8bd3a48e12..37781ba318 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java @@ -41,6 +41,7 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.StreamSupport; +import org.apache.commons.io.IOUtils; import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.guava.common.collect.Iterables; import org.apache.jackrabbit.guava.common.collect.Iterators; @@ -2028,8 +2029,9 @@ public class MongoDocumentStore implements DocumentStore { if (clusterNodesConnection != connection) { clusterNodesConnection.close(); } + try { - throttlingMetricsUpdater.close(); + IOUtils.close(throttlingMetricsUpdater); } catch (IOException e) { LOG.warn("Error occurred while closing throttlingMetricsUpdater", e); }
