Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 79081 invoked from network); 30 Aug 2008 20:17:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Aug 2008 20:17:24 -0000 Received: (qmail 41396 invoked by uid 500); 30 Aug 2008 20:17:22 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 41376 invoked by uid 500); 30 Aug 2008 20:17:22 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 41367 invoked by uid 99); 30 Aug 2008 20:17:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Aug 2008 13:17:22 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Sat, 30 Aug 2008 20:16:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 72212238896B; Sat, 30 Aug 2008 13:16:32 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r690574 - /felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResolverImpl.java Date: Sat, 30 Aug 2008 20:16:32 -0000 To: commits@felix.apache.org From: fmeschbe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080830201632.72212238896B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fmeschbe Date: Sat Aug 30 13:16:31 2008 New Revision: 690574 URL: http://svn.apache.org/viewvc?rev=690574&view=rev Log: FELIX-701 Stop running bundles before updating it and start only when all bundles have been installed/updated to prevent resolution issues when updating running bundles Modified: felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResolverImpl.java Modified: felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResolverImpl.java URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResolverImpl.java?rev=690574&r1=690573&r2=690574&view=diff ============================================================================== --- felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResolverImpl.java (original) +++ felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResolverImpl.java Sat Aug 30 13:16:31 2008 @@ -485,11 +485,21 @@ // Update the installed bundle. try { + // stop the bundle before updating to prevent + // the bundle update from throwing due to not yet + // resolved dependencies + boolean doStartBundle = start; + if (localResource.getBundle().getState() == Bundle.ACTIVE) + { + doStartBundle = true; + localResource.getBundle().stop(); + } + localResource.getBundle().update(deployResources[i].getURL().openStream()); // If necessary, save the updated bundle to be // started later. - if (start) + if (doStartBundle) { startList.add(localResource.getBundle()); }