Return-Path: X-Original-To: apmail-aries-commits-archive@www.apache.org Delivered-To: apmail-aries-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 768C810492 for ; Mon, 3 Nov 2014 17:17:41 +0000 (UTC) Received: (qmail 14295 invoked by uid 500); 3 Nov 2014 17:17:41 -0000 Delivered-To: apmail-aries-commits-archive@aries.apache.org Received: (qmail 14230 invoked by uid 500); 3 Nov 2014 17:17:41 -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 14219 invoked by uid 99); 3 Nov 2014 17:17:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Nov 2014 17:17:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Nov 2014 17:17:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6D65C23888A6; Mon, 3 Nov 2014 17:17:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1636398 - /aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleManager.java Date: Mon, 03 Nov 2014 17:17:19 -0000 To: commits@aries.apache.org From: cschneider@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141103171719.6D65C23888A6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cschneider Date: Mon Nov 3 17:17:18 2014 New Revision: 1636398 URL: http://svn.apache.org/r1636398 Log: ARIES-1162 Destroy persistence unit on unresolved event Modified: aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleManager.java Modified: aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleManager.java URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleManager.java?rev=1636398&r1=1636397&r2=1636398&view=diff ============================================================================== --- aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleManager.java (original) +++ aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleManager.java Mon Nov 3 17:17:18 2014 @@ -284,11 +284,16 @@ public class PersistenceBundleManager im EntityManagerFactoryManager mgr = (EntityManagerFactoryManager) object; //If the bundle was updated we need to destroy it and re-initialize //the EntityManagerFactoryManager - if(event != null && event.getType() == BundleEvent.UPDATED) { + //If the bundle becomes unresolved we need to destroy persistenceUnits, since they + //keep a reference to bundle classloader which has wiring m_isDisposed set to true + //this occurs when Karaf BundleWatcher is used. + if(event != null && (event.getType() == BundleEvent.UPDATED || event.getType() == BundleEvent.UNRESOLVED)) { mgr.destroy(); persistenceUnitFactory.destroyPersistenceBundle(ctx, bundle); - //Don't add to the managersAwaitingProviders, the setupManager will do it - setupManager(bundle, mgr, true); + if (event.getType() == BundleEvent.UPDATED) { + //Don't add to the managersAwaitingProviders, the setupManager will do it + setupManager(bundle, mgr, true); + } } else { try { boolean reassign;