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 2014/02/11 18:47:05 UTC
svn commit: r1567235 - in /jackrabbit/oak/trunk/oak-core/src:
main/java/org/apache/jackrabbit/oak/plugins/document/
main/java/org/apache/jackrabbit/oak/plugins/document/rdb/
test/java/org/apache/jackrabbit/oak/plugins/document/blob/
Author: reschke
Date: Tue Feb 11 17:47:05 2014
New Revision: 1567235
URL: http://svn.apache.org/r1567235
Log:
OAK-1266 - RDBBlobStore now implements Closeable
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/RDBBlobStoreTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1567235&r1=1567234&r2=1567235&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java Tue Feb 11 17:47:05 2014
@@ -61,7 +61,6 @@ import org.apache.jackrabbit.oak.cache.C
import org.apache.jackrabbit.oak.cache.CacheValue;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.kernel.BlobSerializer;
-import org.apache.jackrabbit.oak.plugins.document.rdb.RDBBlobStore;
import org.apache.jackrabbit.oak.plugins.document.util.LoggingDocumentStoreWrapper;
import org.apache.jackrabbit.oak.plugins.document.util.StringValue;
import org.apache.jackrabbit.oak.plugins.document.util.TimingDocumentStoreWrapper;
@@ -352,11 +351,16 @@ public final class DocumentNodeStore
clusterNodeInfo.dispose();
}
store.dispose();
- if (blobStore instanceof RDBBlobStore) {
- // maybe this should be an interface
- ((RDBBlobStore) blobStore).dispose();
- }
LOG.info("Disposed DocumentNodeStore with clusterNodeId: {}", clusterId);
+
+ if (blobStore instanceof Closeable) {
+ try {
+ ((Closeable) blobStore).close();
+ }
+ catch (IOException ex) {
+ LOG.debug("Error closing blob store " + blobStore, ex);
+ }
+ }
}
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java?rev=1567235&r1=1567234&r2=1567235&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java Tue Feb 11 17:47:05 2014
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.document.rdb;
+import java.io.Closeable;
import java.io.IOException;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -33,7 +34,7 @@ import org.apache.jackrabbit.mk.util.Str
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class RDBBlobStore extends AbstractBlobStore {
+public class RDBBlobStore extends AbstractBlobStore implements Closeable {
/**
* Creates a {@linkplain RDBBlobStore} instance using an embedded H2
@@ -74,7 +75,8 @@ public class RDBBlobStore extends Abstra
}
}
- public void dispose() {
+ @Override
+ public void close() {
try {
this.connection.close();
this.connection = null;
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/RDBBlobStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/RDBBlobStoreTest.java?rev=1567235&r1=1567234&r2=1567235&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/RDBBlobStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/RDBBlobStoreTest.java Tue Feb 11 17:47:05 2014
@@ -35,7 +35,7 @@ public class RDBBlobStoreTest extends Ab
public void tearDown() throws Exception {
super.tearDown();
if (blobStore != null) {
- blobStore.dispose();
+ blobStore.close();
}
}
}