Repository: jclouds-labs Updated Branches: refs/heads/master f9b393de0 -> 7d5854b41
JCLOUDS-1060: Close PersistService consistently Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/7d5854b4 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/7d5854b4 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/7d5854b4 Branch: refs/heads/master Commit: 7d5854b41d673b16cd246c1bbd767f18338442aa Parents: f9b393d Author: Andrew Gaul <[email protected]> Authored: Wed Jan 20 15:46:01 2016 -0800 Committer: Andrew Gaul <[email protected]> Committed: Wed Jan 20 15:47:02 2016 -0800 ---------------------------------------------------------------------- .../java/org/jclouds/jdbc/config/JPAInitializer.java | 12 +++++++++++- .../java/org/jclouds/jdbc/BaseJdbcBlobStoreTest.java | 2 -- 2 files changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7d5854b4/jdbc/src/main/java/org/jclouds/jdbc/config/JPAInitializer.java ---------------------------------------------------------------------- diff --git a/jdbc/src/main/java/org/jclouds/jdbc/config/JPAInitializer.java b/jdbc/src/main/java/org/jclouds/jdbc/config/JPAInitializer.java index 4df2730..08dba6e 100644 --- a/jdbc/src/main/java/org/jclouds/jdbc/config/JPAInitializer.java +++ b/jdbc/src/main/java/org/jclouds/jdbc/config/JPAInitializer.java @@ -16,14 +16,24 @@ */ package org.jclouds.jdbc.config; +import java.io.Closeable; + +import org.jclouds.lifecycle.Closer; + import com.google.inject.Inject; import com.google.inject.persist.PersistService; public class JPAInitializer { @Inject - private JPAInitializer(PersistService persistService) { + private JPAInitializer(final PersistService persistService, Closer closer) { persistService.start(); + closer.addToClose(new Closeable() { + @Override + public void close() { + persistService.stop(); + } + }); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7d5854b4/jdbc/src/test/java/org/jclouds/jdbc/BaseJdbcBlobStoreTest.java ---------------------------------------------------------------------- diff --git a/jdbc/src/test/java/org/jclouds/jdbc/BaseJdbcBlobStoreTest.java b/jdbc/src/test/java/org/jclouds/jdbc/BaseJdbcBlobStoreTest.java index afd6559..437e87c 100644 --- a/jdbc/src/test/java/org/jclouds/jdbc/BaseJdbcBlobStoreTest.java +++ b/jdbc/src/test/java/org/jclouds/jdbc/BaseJdbcBlobStoreTest.java @@ -22,7 +22,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.common.io.ByteSource; import com.google.inject.Module; -import com.google.inject.persist.PersistService; import com.google.inject.persist.jpa.JpaPersistModule; import org.jclouds.ContextBuilder; import org.jclouds.blobstore.BlobRequestSigner; @@ -88,7 +87,6 @@ public abstract class BaseJdbcBlobStoreTest { @AfterMethod protected void tearDown() throws IOException { - context.utils().injector().getInstance(PersistService.class).stop(); context.close(); }
