Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 82367 invoked from network); 18 Apr 2011 20:32:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 18 Apr 2011 20:32:38 -0000 Received: (qmail 33301 invoked by uid 500); 18 Apr 2011 20:32:38 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 33251 invoked by uid 500); 18 Apr 2011 20:32:38 -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 33244 invoked by uid 99); 18 Apr 2011 20:32:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Apr 2011 20:32:38 +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, 18 Apr 2011 20:32:36 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 26C3A238890A; Mon, 18 Apr 2011 20:32:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1094731 - /geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java Date: Mon, 18 Apr 2011 20:32:15 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110418203215.26C3A238890A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Mon Apr 18 20:32:14 2011 New Revision: 1094731 URL: http://svn.apache.org/viewvc?rev=1094731&view=rev Log: GERONIMO-5918: Resolve unresolved application only Modified: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java Modified: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java?rev=1094731&r1=1094730&r2=1094731&view=diff ============================================================================== --- geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java (original) +++ geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java Mon Apr 18 20:32:14 2011 @@ -157,10 +157,12 @@ public class ApplicationConfigBuilder im throw new DeploymentException("Error creating Aries Application", e); } - try { - app = appManager.resolve(app); - } catch (Exception e) { - throw new DeploymentException("Error resolving Aries Application", e); + if (!app.isResolved()) { + try { + app = appManager.resolve(app); + } catch (Exception e) { + throw new DeploymentException("Error resolving Aries Application", e); + } } DeploymentContext context = installer.startInstall(app, targetConfigurationStore);