You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by gn...@apache.org on 2010/02/16 22:17:59 UTC
svn commit: r910698 -
/incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java
Author: gnodet
Date: Tue Feb 16 21:17:58 2010
New Revision: 910698
URL: http://svn.apache.org/viewvc?rev=910698&view=rev
Log:
Slightly refactor the application creation so that the flow is easier to grab
Modified:
incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java
Modified: incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java?rev=910698&r1=910697&r2=910698&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java (original)
+++ incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java Tue Feb 16 21:17:58 2010
@@ -175,17 +175,14 @@
}
}
- if (deploymentMetadata != null) {
- application = new AriesApplicationImpl (applicationMetadata, deploymentMetadata, extraBundlesInfo, _localPlatform);
- } else {
- application = new AriesApplicationImpl (applicationMetadata, extraBundlesInfo, _localPlatform);
+ application = new AriesApplicationImpl (applicationMetadata, extraBundlesInfo, _localPlatform);
+ if (deploymentMetadata == null) {
Set<BundleInfo> additionalBundlesRequired = _resolver.resolve(application);
deploymentMetadata = _deploymentMetadataFactory.createDeploymentMetadata(application, additionalBundlesRequired);
- application.setDeploymentMetadata(deploymentMetadata);
-
- // Store a reference to any modified bundles
- application.setModifiedBundles (modifiedBundles);
}
+ application.setDeploymentMetadata(deploymentMetadata);
+ // Store a reference to any modified bundles
+ application.setModifiedBundles (modifiedBundles);
} catch (IOException iox) {
_logger.error ("APPMANAGEMENT0006E", new Object []{ebaFile.getName(), iox});
throw new ManagementException(iox);