You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2017/02/23 14:41:19 UTC
svn commit: r1784143 - in /jackrabbit/oak/branches/1.6: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/BlobCache.java
Author: reschke
Date: Thu Feb 23 14:41:19 2017
New Revision: 1784143
URL: http://svn.apache.org/viewvc?rev=1784143&view=rev
Log:
OAK-5773: BlobCache does not implement Closeable (ported to 1.6)
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/BlobCache.java
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 23 14:41:19 2017
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782770,1782945,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783619,1783731,1783733,1783742,1783855
+/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782770,1782945,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783619,1783731,1783733,1783742,1783855,1784130
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/BlobCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/BlobCache.java?rev=1784143&r1=1784142&r2=1784143&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/BlobCache.java (original)
+++ jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/BlobCache.java Thu Feb 23 14:41:19 2017
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.document.persistentCache;
+import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
import java.nio.ByteBuffer;
@@ -37,7 +38,7 @@ import org.slf4j.LoggerFactory;
* A persistent blob cache. Only blobs that are smaller than 10% of the maximum
* cache size are stored.
*/
-public class BlobCache implements GarbageCollectableBlobStore, GenerationCache {
+public class BlobCache implements GarbageCollectableBlobStore, GenerationCache, Closeable {
static final Logger LOG = LoggerFactory.getLogger(BlobCache.class);
@@ -224,5 +225,12 @@ public class BlobCache implements Garbag
public void receive(ByteBuffer buff) {
throw new UnsupportedOperationException();
}
+
+ @Override
+ public void close() throws IOException {
+ if (base instanceof Closeable) {
+ ((Closeable)base).close();
+ }
+ }
}