Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DDFAE9C74 for ; Wed, 9 May 2012 03:59:24 +0000 (UTC) Received: (qmail 13949 invoked by uid 500); 9 May 2012 03:59:24 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 13794 invoked by uid 500); 9 May 2012 03:59:24 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 13768 invoked by uid 99); 9 May 2012 03:59:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 May 2012 03:59:23 +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; Wed, 09 May 2012 03:59:22 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3506C2388865; Wed, 9 May 2012 03:59:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1335915 - /geronimo/server/branches/3.0-beta/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationUpdateHelper.java Date: Wed, 09 May 2012 03:59:02 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120509035902.3506C2388865@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Wed May 9 03:59:01 2012 New Revision: 1335915 URL: http://svn.apache.org/viewvc?rev=1335915&view=rev Log: update eba first before causing bundle refresh Modified: geronimo/server/branches/3.0-beta/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationUpdateHelper.java Modified: geronimo/server/branches/3.0-beta/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationUpdateHelper.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationUpdateHelper.java?rev=1335915&r1=1335914&r2=1335915&view=diff ============================================================================== --- geronimo/server/branches/3.0-beta/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationUpdateHelper.java (original) +++ geronimo/server/branches/3.0-beta/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationUpdateHelper.java Wed May 9 03:59:01 2012 @@ -128,12 +128,6 @@ public class ApplicationUpdateHelper { LOG.info("Update of {} bundle will cause the following bundles to be refreshed: {}", bundleName, bundleListString); } - // install listener for package refresh - RefreshListener refreshListener = new RefreshListener(); - - // refresh the bundle - this happens asynchronously - wiring.refreshBundles(bundles, refreshListener); - // update application archive try { updateEBA(targetBundle, bundleFile); @@ -141,8 +135,10 @@ public class ApplicationUpdateHelper { LOG.warn("Error updating application archive with the new contents. " + "Changes made might be gone next time the application or server is restarted.", e.getMessage()); } - - // wait for package refresh to finish + + // refresh the bundle and its dependents + RefreshListener refreshListener = new RefreshListener(); + wiring.refreshBundles(bundles, refreshListener); refreshListener.waitForRefresh(bundleRefreshTimeout); // start the bundle