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 5A6561977E for ; Tue, 1 Mar 2016 09:35:15 +0000 (UTC) Received: (qmail 77851 invoked by uid 500); 1 Mar 2016 09:35:15 -0000 Delivered-To: apmail-aries-commits-archive@aries.apache.org Received: (qmail 77783 invoked by uid 500); 1 Mar 2016 09:35:15 -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 77771 invoked by uid 99); 1 Mar 2016 09:35:15 -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; Tue, 01 Mar 2016 09:35:15 +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 C950BC0CD7 for ; Tue, 1 Mar 2016 09:35:14 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.671 X-Spam-Level: X-Spam-Status: No, score=0.671 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.329] autolearn=disabled Received: from mx2-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 nEIJ9jkgcd1h for ; Tue, 1 Mar 2016 09:35:14 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with ESMTP id C3EDF5FAE2 for ; Tue, 1 Mar 2016 09:35:13 +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 31FD1E0057 for ; Tue, 1 Mar 2016 09:35:13 +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 2F6093A024F for ; Tue, 1 Mar 2016 09:35:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1733018 - /aries/branches/jpa-1.x/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleManager.java Date: Tue, 01 Mar 2016 09:35:13 -0000 To: commits@aries.apache.org From: gnodet@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160301093513.2F6093A024F@svn01-us-west.apache.org> Author: gnodet Date: Tue Mar 1 09:35:12 2016 New Revision: 1733018 URL: http://svn.apache.org/viewvc?rev=1733018&view=rev Log: [ARIES-1499] Refreshing a persistent bundle leaves it in the grace period blueprint state Modified: aries/branches/jpa-1.x/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleManager.java Modified: aries/branches/jpa-1.x/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleManager.java URL: http://svn.apache.org/viewvc/aries/branches/jpa-1.x/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleManager.java?rev=1733018&r1=1733017&r2=1733018&view=diff ============================================================================== --- aries/branches/jpa-1.x/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleManager.java (original) +++ aries/branches/jpa-1.x/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleManager.java Tue Mar 1 09:35:12 2016 @@ -239,10 +239,8 @@ public class PersistenceBundleManager im if(event != null && (event.getType() == BundleEvent.UPDATED || event.getType() == BundleEvent.UNRESOLVED)) { mgr.destroy(); persistenceUnitFactory.destroyPersistenceBundle(ctx, bundle); - if (event.getType() == BundleEvent.UPDATED) { - //Don't add to the managersAwaitingProviders, the setupManager will do it - setupManager(bundle, mgr, true); - } + //Don't add to the managersAwaitingProviders, the setupManager will do it + setupManager(bundle, mgr, event.getType() == BundleEvent.UPDATED); } else { try { boolean reassign;