[ARIES-1575] Use the Persistence Bundle's context to get the Persistence Provider
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1748744 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleTracker.java b/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleTracker.java
index b777741..f468cfa 100644
--- a/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleTracker.java
+++ b/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleTracker.java
@@ -40,11 +40,11 @@
public class PersistenceBundleTracker implements BundleTrackerCustomizer<Bundle> {
private static final Logger LOGGER = LoggerFactory.getLogger(PersistenceBundleTracker.class);
private final Map<Bundle, Collection<PersistenceProviderTracker>> trackers;
- private final BundleContext context;
+ private final BundleContext containerContext;
private Map<Integer, String> typeMap;
public PersistenceBundleTracker(BundleContext context) {
- this.context = context;
+ this.containerContext = context;
trackers = new HashMap<Bundle, Collection<PersistenceProviderTracker>>();
this.typeMap = new HashMap<Integer, String>();
this.typeMap.put(BundleEvent.INSTALLED, "INSTALLED");
@@ -102,7 +102,7 @@
LOGGER.info(String.format("Found persistence unit %s in bundle %s with provider %s.",
punit.getPersistenceUnitName(), bundle.getSymbolicName(),
punit.getPersistenceProviderClassName()));
- PersistenceProviderTracker tracker = new PersistenceProviderTracker(context, punit);
+ PersistenceProviderTracker tracker = new PersistenceProviderTracker(containerContext, punit);
tracker.open();
getTrackers(bundle).add(tracker);
}
diff --git a/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceProviderTracker.java b/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceProviderTracker.java
index 787b2fd..91e53ff 100644
--- a/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceProviderTracker.java
+++ b/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceProviderTracker.java
@@ -48,8 +48,8 @@
private PersistenceUnit punit;
- public PersistenceProviderTracker(BundleContext context, PersistenceUnit punit) {
- super(context, createFilter(context, punit), null);
+ public PersistenceProviderTracker(BundleContext containerContext, PersistenceUnit punit) {
+ super(containerContext, createFilter(containerContext, punit), null);
this.punit = punit;
}
@@ -80,7 +80,9 @@
}
StoredPerProvider stored = new StoredPerProvider();
LOGGER.info("Found provider for " + punit.getPersistenceUnitName() + " " + punit.getPersistenceProviderClassName());
- PersistenceProvider provider = context.getService(reference);
+
+ // This get must happen using the persistence bundle's context to avoid ARIES-1575
+ PersistenceProvider provider = punit.getBundle().getBundleContext().getService(reference);
createAndCloseDummyEMF(provider);
