Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D1F36200BA7 for ; Fri, 21 Oct 2016 17:48:37 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D0715160AE8; Fri, 21 Oct 2016 15:48:37 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id F0B56160ADE for ; Fri, 21 Oct 2016 17:48:36 +0200 (CEST) Received: (qmail 75626 invoked by uid 500); 21 Oct 2016 15:48:36 -0000 Mailing-List: contact commits-help@aries.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aries.apache.org Delivered-To: mailing list commits@aries.apache.org Received: (qmail 75615 invoked by uid 99); 21 Oct 2016 15:48:36 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Oct 2016 15:48:36 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id B5AE6C0118 for ; Fri, 21 Oct 2016 15:48:35 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -1.199 X-Spam-Level: X-Spam-Status: No, score=-1.199 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id vVJNFyHv0xDW for ; Fri, 21 Oct 2016 15:48:34 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP id 0CE0B5F201 for ; Fri, 21 Oct 2016 15:48:34 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 1FF11E035C for ; Fri, 21 Oct 2016 15:48:31 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id E32383A0046 for ; Fri, 21 Oct 2016 15:48:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1766052 - in /aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl: Activator.java PersistenceBundleTracker.java PersistenceProviderTracker.java Date: Fri, 21 Oct 2016 15:48:30 -0000 To: commits@aries.apache.org From: cschneider@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20161021154830.E32383A0046@svn01-us-west.apache.org> archived-at: Fri, 21 Oct 2016 15:48:38 -0000 Author: cschneider Date: Fri Oct 21 15:48:30 2016 New Revision: 1766052 URL: http://svn.apache.org/viewvc?rev=1766052&view=rev Log: [ARIES-1575] Use bundle context of persistence bundle for tracker Modified: aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/Activator.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleTracker.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceProviderTracker.java Modified: aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/Activator.java URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/Activator.java?rev=1766052&r1=1766051&r2=1766052&view=diff ============================================================================== --- aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/Activator.java (original) +++ aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/Activator.java Fri Oct 21 15:48:30 2016 @@ -38,7 +38,7 @@ public class Activator implements Bundle public void start(BundleContext context) throws Exception { registerWeavingHook(context, TransformerRegistrySingleton.get()); - PersistenceBundleTracker customizer = new PersistenceBundleTracker(context); + PersistenceBundleTracker customizer = new PersistenceBundleTracker(); persistenceBundleManager = new BundleTracker(context, Bundle.STARTING | Bundle.ACTIVE, customizer); persistenceBundleManager.open(); } Modified: aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleTracker.java URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleTracker.java?rev=1766052&r1=1766051&r2=1766052&view=diff ============================================================================== --- aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleTracker.java (original) +++ aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleTracker.java Fri Oct 21 15:48:30 2016 @@ -27,7 +27,6 @@ import java.util.Map; import org.apache.aries.jpa.container.parser.impl.PersistenceUnit; import org.apache.aries.jpa.container.parser.impl.PersistenceUnitParser; import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; import org.osgi.framework.BundleEvent; import org.osgi.util.tracker.BundleTrackerCustomizer; import org.slf4j.Logger; @@ -40,11 +39,9 @@ import org.slf4j.LoggerFactory; public class PersistenceBundleTracker implements BundleTrackerCustomizer { private static final Logger LOGGER = LoggerFactory.getLogger(PersistenceBundleTracker.class); private final Map> trackers; - private final BundleContext containerContext; private Map typeMap; - public PersistenceBundleTracker(BundleContext context) { - this.containerContext = context; + public PersistenceBundleTracker() { trackers = new HashMap>(); this.typeMap = new HashMap(); this.typeMap.put(BundleEvent.INSTALLED, "INSTALLED"); @@ -102,7 +99,7 @@ public class PersistenceBundleTracker im LOGGER.info(String.format("Found persistence unit %s in bundle %s with provider %s.", punit.getPersistenceUnitName(), bundle.getSymbolicName(), punit.getPersistenceProviderClassName())); - PersistenceProviderTracker tracker = new PersistenceProviderTracker(containerContext, punit); + PersistenceProviderTracker tracker = new PersistenceProviderTracker(bundle.getBundleContext(), punit); tracker.open(); getTrackers(bundle).add(tracker); } Modified: aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceProviderTracker.java URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceProviderTracker.java?rev=1766052&r1=1766051&r2=1766052&view=diff ============================================================================== --- aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceProviderTracker.java (original) +++ aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceProviderTracker.java Fri Oct 21 15:48:30 2016 @@ -81,8 +81,7 @@ public class PersistenceProviderTracker StoredPerProvider stored = new StoredPerProvider(); LOGGER.info("Found provider for " + punit.getPersistenceUnitName() + " " + punit.getPersistenceProviderClassName()); - // This get must happen using the persistence bundle's context to avoid ARIES-1575 - PersistenceProvider provider = punit.getBundle().getBundleContext().getService(reference); + PersistenceProvider provider = context.getService(reference); createAndCloseDummyEMF(provider);