geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
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 GMT
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);



Mime
View raw message