You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2013/12/12 10:20:44 UTC
git commit: we don't need to build the template at the partition
validation time
Updated Branches:
refs/heads/master bed00664c -> 41c048ec1
we don't need to build the template at the partition validation time
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/41c048ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/41c048ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/41c048ec
Branch: refs/heads/master
Commit: 41c048ec1eb5202a837de9dd9d9cf4951f41413d
Parents: bed0066
Author: Nirmal Fernando <ni...@apache.org>
Authored: Thu Dec 12 14:49:55 2013 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Thu Dec 12 14:50:12 2013 +0530
----------------------------------------------------------------------
.../cloud/controller/impl/CloudControllerServiceImpl.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/41c048ec/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 7f14253..34adae5 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
@@ -33,6 +33,7 @@ import org.apache.stratos.cloud.controller.exception.UnregisteredCartridgeExcept
import org.apache.stratos.cloud.controller.exception.UnregisteredClusterException;
import org.apache.stratos.cloud.controller.interfaces.CloudControllerService;
import org.apache.stratos.cloud.controller.interfaces.Iaas;
+import org.apache.stratos.cloud.controller.jcloud.ComputeServiceBuilderUtil;
import org.apache.stratos.cloud.controller.persist.Deserializer;
import org.apache.stratos.cloud.controller.pojo.Cartridge;
import org.apache.stratos.cloud.controller.pojo.CartridgeConfig;
@@ -1145,7 +1146,8 @@ public class CloudControllerServiceImpl implements CloudControllerService {
if (iaas == null) {
try {
iaas = (Iaas) Class.forName(iaasProvider.getClassName()).newInstance();
- iaas.buildComputeServiceAndTemplate(iaasProvider);
+ // builds and sets Compute Service
+ ComputeServiceBuilderUtil.buildDefaultComputeService(iaasProvider);
iaasProvider.setIaas(iaas);
} catch (Exception e) {
String msg =