incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r910441 - /incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java
Date Tue, 16 Feb 2010 09:23:26 GMT
Author: gnodet
Date: Tue Feb 16 09:23:25 2010
New Revision: 910441

URL: http://svn.apache.org/viewvc?rev=910441&view=rev
Log:
ARIES-170: AriesApplicationManagerImpl#createApplication creates the application once for
each included bundle

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=910441&r1=910440&r2=910441&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 09:23:25 2010
@@ -173,20 +173,20 @@
             }
           }
         } 
-        if (deploymentMetadata != null) { 
-          application = new AriesApplicationImpl (applicationMetadata, deploymentMetadata,
extraBundlesInfo, _localPlatform);
-        } else { 
-          application = new AriesApplicationImpl (applicationMetadata, extraBundlesInfo,
_localPlatform);
-          Set<BundleInfo> additionalBundlesRequired = _resolver.resolve(application);
-          deploymentMetadata = _deploymentMetadataFactory.createDeploymentMetadata(application,
additionalBundlesRequired);
-          application.setDeploymentMetadata(deploymentMetadata);
-        
-          // Store a reference to any modified bundles
-          application.setModifiedBundles (modifiedBundles);
-        }
-        
       }
-    } catch (IOException iox) { 
+
+      if (deploymentMetadata != null) { 
+        application = new AriesApplicationImpl (applicationMetadata, deploymentMetadata,
extraBundlesInfo, _localPlatform);
+      } else {
+        application = new AriesApplicationImpl (applicationMetadata, extraBundlesInfo, _localPlatform);
+        Set<BundleInfo> additionalBundlesRequired = _resolver.resolve(application);
+        deploymentMetadata = _deploymentMetadataFactory.createDeploymentMetadata(application,
additionalBundlesRequired);
+        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);
     } catch (ResolverException rx) { 



Mime
View raw message