You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2011/04/18 22:32:15 UTC
svn commit: r1094731 -
/geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java
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);