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 450E2F806 for ; Tue, 2 Apr 2013 19:37:53 +0000 (UTC) Received: (qmail 83031 invoked by uid 500); 2 Apr 2013 19:37:53 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 82994 invoked by uid 500); 2 Apr 2013 19:37:53 -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 82987 invoked by uid 99); 2 Apr 2013 19:37:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Apr 2013 19:37:53 +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; Tue, 02 Apr 2013 19:37:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C5F8523889BB; Tue, 2 Apr 2013 19:37:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1463715 - /geronimo/server/branches/3.0/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java Date: Tue, 02 Apr 2013 19:37:31 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130402193731.C5F8523889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Tue Apr 2 19:37:31 2013 New Revision: 1463715 URL: http://svn.apache.org/r1463715 Log: GERONIMO-6443: Try bundle resolution twice (a work-around) Modified: geronimo/server/branches/3.0/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java Modified: geronimo/server/branches/3.0/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java?rev=1463715&r1=1463714&r2=1463715&view=diff ============================================================================== --- geronimo/server/branches/3.0/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java (original) +++ geronimo/server/branches/3.0/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java Tue Apr 2 19:37:31 2013 @@ -427,9 +427,14 @@ public class ApplicationGBean implements BundleContext context = bundle.getBundleContext(); FrameworkWiring wiring = context.getBundle(0).adapt(FrameworkWiring.class); if (!wiring.resolveBundles(applicationBundles)) { - throw new BundleException("One or more bundles in " + getApplicationName() + " application could not be resolved."); + LOG.debug("First resolution of application bundles failed."); + if (!wiring.resolveBundles(applicationBundles)) { + throw new BundleException("One or more bundles in " + getApplicationName() + " application could not be resolved."); + } else { + LOG.debug("Second resolution of application bundles was successful."); + } } - + setApplicationState(ApplicationState.RESOLVED); setApplicationState(ApplicationState.STARTING);