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 4b8a67c6c2e6a3934674cfef0c71a15ca8acd603 Author: Julian Reschke <[email protected]> AuthorDate: Tue Mar 4 10:54:29 2025 +0100 Revert "OAK-11500: fix change in MongoDocumentStore" This reverts commit 91ce7801d57c81a71c1c5dc10ca2adbd6d641970. --- .../oak/plugins/blob/AbstractSharedCachingDataStore.java | 10 +++++++--- .../oak/plugins/document/mongo/MongoDocumentStore.java | 4 +--- 2 files changed, 8 insertions(+), 6 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 d70f847b43..dcd57525b4 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,11 +326,15 @@ public abstract class AbstractSharedCachingDataStore extends AbstractDataStore try { // If cache configured to 0 will return null if (cached == null || !cached.exists()) { - TransientFileFactory fileFactory = TransientFileFactory.getInstance(); - File tmpFile = fileFactory.createTransientFile("temp0cache", null, temp); - try (InputStream in = backend.getRecord(getIdentifier()).getStream()) { + InputStream in = null; + try { + TransientFileFactory fileFactory = TransientFileFactory.getInstance(); + File tmpFile = fileFactory.createTransientFile("temp0cache", null, temp); + 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 37781ba318..8bd3a48e12 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,7 +41,6 @@ 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; @@ -2029,9 +2028,8 @@ public class MongoDocumentStore implements DocumentStore { if (clusterNodesConnection != connection) { clusterNodesConnection.close(); } - try { - IOUtils.close(throttlingMetricsUpdater); + throttlingMetricsUpdater.close(); } catch (IOException e) { LOG.warn("Error occurred while closing throttlingMetricsUpdater", e); }
