You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2014/05/24 07:50:11 UTC
git commit: set persistent mapping payload from the subscription
Repository: incubator-stratos
Updated Branches:
refs/heads/master cd9d6ae21 -> 0de9e37e5
set persistent mapping payload from the subscription
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/0de9e37e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/0de9e37e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/0de9e37e
Branch: refs/heads/master
Commit: 0de9e37e5af70a7c10f8e51653eb91389fbd81e6
Parents: cd9d6ae
Author: Udara Liyanage <ud...@wso2.com>
Authored: Sat May 24 11:19:06 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Sat May 24 11:19:06 2014 +0530
----------------------------------------------------------------------
.../controller/impl/CloudControllerServiceImpl.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0de9e37e/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 2bc8f78..c1e65b6 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
@@ -298,7 +298,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
Iaas iaas = iaasProvider.getIaas();
if(ctxt.isVolumeRequired()){
- addToPayload(payload, "PERSISTENCE_MAPPING", getPersistencePayload(cartridge, iaas).toString());
+ addToPayload(payload, "PERSISTENCE_MAPPING", getPersistencePayload(ctxt, iaas).toString());
}
if (log.isDebugEnabled()) {
@@ -436,10 +436,10 @@ public class CloudControllerServiceImpl implements CloudControllerService {
}
- private StringBuilder getPersistencePayload(Cartridge cartridge, Iaas iaas) {
+ private StringBuilder getPersistencePayload(ClusterContext ctx, Iaas iaas) {
StringBuilder persistencePayload = new StringBuilder();
- if(isPersistenceMappingAvailable(cartridge)){
- for(Volume volume : cartridge.getPersistence().getVolumes()){
+ if(isPersistenceMappingAvailable(ctx)){
+ for(Volume volume : ctx.getVolumes()){
if(log.isDebugEnabled()){
log.debug("Adding persistence mapping " + volume.toString());
}
@@ -457,8 +457,8 @@ public class CloudControllerServiceImpl implements CloudControllerService {
return persistencePayload;
}
- private boolean isPersistenceMappingAvailable(Cartridge cartridge) {
- return cartridge.getPersistence() != null && cartridge.getPersistence().isPersistanceRequired();
+ private boolean isPersistenceMappingAvailable(ClusterContext ctx) {
+ return ctx.getVolumes() != null && ctx.isVolumeRequired();
}
private void addToPayload(StringBuilder payload, String name, String value) {