Author: reschke
Date: Tue Jan 21 15:57:22 2014
New Revision: 1560047
URL: http://svn.apache.org/r1560047
Log:
OAK-1266 - blob store: add dispose and use it from test
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/sqlpersistence/SQLBlobStore.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/blob/SQLBlobStoreTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/sqlpersistence/SQLBlobStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/sqlpersistence/SQLBlobStore.java?rev=1560047&r1=1560046&r2=1560047&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/sqlpersistence/SQLBlobStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/sqlpersistence/SQLBlobStore.java
Tue Jan 21 15:57:22 2014
@@ -58,6 +58,15 @@ public class SQLBlobStore extends Abstra
}
}
+ public void dispose() {
+ try {
+ this.connection.close();
+ this.connection = null;
+ } catch (SQLException ex) {
+ throw new MicroKernelException(ex);
+ }
+ }
+
private Connection connection;
private void initialize(String jdbcurl, String username, String password)
throws Exception {
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/blob/SQLBlobStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/blob/SQLBlobStoreTest.java?rev=1560047&r1=1560046&r2=1560047&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/blob/SQLBlobStoreTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/blob/SQLBlobStoreTest.java
Tue Jan 21 15:57:22 2014
@@ -23,8 +23,10 @@ import org.apache.jackrabbit.oak.plugins
*/
public class SQLBlobStoreTest extends AbstractBlobStoreTest {
+ private SQLBlobStore blobStore;
+
public void setUp() throws Exception {
- SQLBlobStore blobStore = new SQLBlobStore();
+ blobStore = new SQLBlobStore();
blobStore.setBlockSize(128);
blobStore.setBlockSizeMin(48);
this.store = blobStore;
@@ -32,5 +34,6 @@ public class SQLBlobStoreTest extends Ab
public void tearDown() throws Exception {
super.tearDown();
+ blobStore.dispose();
}
}