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/14 11:18:23 UTC
git commit: build only compute service at partition validation
Updated Branches:
refs/heads/master d1ddd6eb7 -> 413661e59
build only compute service at partition validation
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/413661e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/413661e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/413661e5
Branch: refs/heads/master
Commit: 413661e596c8be0092b61ba8288afbf7730714cd
Parents: d1ddd6e
Author: Nirmal Fernando <ni...@apache.org>
Authored: Sat Dec 14 15:48:06 2013 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Sat Dec 14 15:48:06 2013 +0530
----------------------------------------------------------------------
.../controller/impl/CloudControllerServiceImpl.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/413661e5/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 26bff76..df7655c 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
@@ -1090,11 +1090,13 @@ public class CloudControllerServiceImpl implements CloudControllerService {
if (iaas == null) {
try {
- iaas = setIaas(iaasProvider);
- } catch (InvalidIaasProviderException e) {
+ iaas = (Iaas) Class.forName(iaasProvider.getClassName()).newInstance();
+ ComputeServiceBuilderUtil.buildDefaultComputeService(iaasProvider);
+ iaasProvider.setIaas(iaas);
+ } catch (Exception e) {
String msg =
- "Invalid Partition - " + partition.toString() +
- ". Cause: Unable to build Iaas of this IaasProvider [Provider] : " + provider;
+ "Unable to build the jclouds object for iaas " + "of type: " +
+ iaasProvider.getType();
log.error(msg, e);
throw new InvalidPartitionException(msg, e);
}
@@ -1106,8 +1108,6 @@ public class CloudControllerServiceImpl implements CloudControllerService {
validator.validate(partition.getId(),
CloudControllerUtil.toJavaUtilProperties(partition.getProperties()));
- persist();
-
return true;
}