stratos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From im...@apache.org
Subject git commit: Fixing merge issue in CloudControllerServiceImpl.deployCartridgeDefinition() method
Date Fri, 31 Oct 2014 10:58:40 GMT
Repository: stratos
Updated Branches:
  refs/heads/docker-grouping-merge e1f37d63f -> 262f3635a


Fixing merge issue in CloudControllerServiceImpl.deployCartridgeDefinition() method


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/262f3635
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/262f3635
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/262f3635

Branch: refs/heads/docker-grouping-merge
Commit: 262f3635ab4d742538445d374e1fae5fd994b185
Parents: e1f37d6
Author: Imesh Gunaratne <imesh@apache.org>
Authored: Fri Oct 31 16:28:32 2014 +0530
Committer: Imesh Gunaratne <imesh@apache.org>
Committed: Fri Oct 31 16:28:32 2014 +0530

----------------------------------------------------------------------
 .../impl/CloudControllerServiceImpl.java        | 36 +++++++++-----------
 .../domain/topology/ParentComponent.java        |  2 +-
 2 files changed, 18 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/262f3635/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
index 34a611f..901082c 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
@@ -155,25 +155,25 @@ public class CloudControllerServiceImpl implements CloudControllerService
{
         List<IaasProvider> iaases = cartridge.getIaases();
         
 		if (!StratosConstants.KUBERNETES_DEPLOYER_TYPE.equals(cartridge.getDeployerType())) {
-			if (iaases == null || iaases.isEmpty()) {
-				String msg = "Invalid Cartridge Definition: Cartridge Type: "
-						+ cartridgeConfig.getType()
-						+ ". Cause: Iaases of this Cartridge is null or empty.";
-				LOG.error(msg);
-				throw new InvalidCartridgeDefinitionException(msg);
-			}
+            if (iaases == null || iaases.isEmpty()) {
+                String msg = "Invalid Cartridge Definition: Cartridge Type: "
+                        + cartridgeConfig.getType()
+                        + ". Cause: Iaases of this Cartridge is null or empty.";
+                LOG.error(msg);
+                throw new InvalidCartridgeDefinitionException(msg);
+            }
 
-        if (iaases == null || iaases.isEmpty()) {
-            String msg =
-                    "Invalid Cartridge Definition: Cartridge Type: " +
-                            cartridgeConfig.getType()+
-                            ". Cause: Iaases of this Cartridge is null or empty.";
-            LOG.error(msg);
-            throw new InvalidCartridgeDefinitionException(msg);
-        }
+            if (iaases == null || iaases.isEmpty()) {
+                String msg = "Invalid Cartridge Definition: Cartridge Type: " +
+                        cartridgeConfig.getType() +
+                        ". Cause: Iaases of this Cartridge is null or empty.";
+                LOG.error(msg);
+                throw new InvalidCartridgeDefinitionException(msg);
+            }
 
-        for (IaasProvider iaasProvider : iaases) {
-            CloudControllerUtil.getIaas(iaasProvider);
+            for (IaasProvider iaasProvider : iaases) {
+                CloudControllerUtil.getIaas(iaasProvider);
+            }
         }
 
         // TODO transaction begins
@@ -201,8 +201,6 @@ public class CloudControllerServiceImpl implements CloudControllerService
{
         // transaction ends
         
         LOG.info("Successfully deployed the Cartridge definition: " + cartridgeType);
-        
-		}
     }
 
     private void populateNewCartridge(Cartridge cartridge,

http://git-wip-us.apache.org/repos/asf/stratos/blob/262f3635/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ParentComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ParentComponent.java
b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ParentComponent.java
index 86000e9..1a80341 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ParentComponent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ParentComponent.java
@@ -24,7 +24,7 @@ import java.util.*;
 
 /**
  * Abstraction for a an entity that can have child entities
- * in an Application withing the Topology
+ * in an Application within the Topology
  */
 
 public abstract class ParentComponent implements Serializable {


Mime
View raw message