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 2014/12/02 15:12:52 UTC
[3/3] stratos git commit: Cloud controller data retrieval from
registry is broken after recent refactoring. Fixing the issue with this
commit.
Cloud controller data retrieval from registry is broken after recent refactoring. Fixing the issue with this commit.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c5527169
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c5527169
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c5527169
Branch: refs/heads/master
Commit: c55271694eb073716fb9f1d1b74c9d3fdd176bbd
Parents: 98244f7
Author: Nirmal Fernando <ni...@gmail.com>
Authored: Tue Dec 2 19:43:52 2014 +0530
Committer: Nirmal Fernando <ni...@gmail.com>
Committed: Tue Dec 2 19:43:52 2014 +0530
----------------------------------------------------------------------
.../context/CloudControllerContext.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/c5527169/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
index 2a7dafb..4e449db 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
@@ -545,16 +545,16 @@ public class CloudControllerContext implements Serializable {
if (dataObj instanceof CloudControllerContext) {
CloudControllerContext serializedObj = (CloudControllerContext) dataObj;
- copyMap(kubernetesGroupsMap, serializedObj.kubernetesGroupsMap);
- copyMap(clusterIdToMemberContextListMap, serializedObj.clusterIdToMemberContextListMap);
- copyMap(memberIdToMemberContextMap, serializedObj.memberIdToMemberContextMap);
- copyMap(memberIdToScheduledTaskMap, serializedObj.memberIdToScheduledTaskMap);
- copyMap(kubClusterIdToKubClusterContextMap, serializedObj.kubClusterIdToKubClusterContextMap);
- copyMap(clusterIdToContextMap, serializedObj.clusterIdToContextMap);
- copyMap(cartridgeTypeToPartitionIdsMap, serializedObj.cartridgeTypeToPartitionIdsMap);
-
- copyList(cartridges, serializedObj.getCartridges());
- copyList(serviceGroups, serializedObj.getServiceGroups());
+ copyMap(serializedObj.kubernetesGroupsMap, kubernetesGroupsMap);
+ copyMap(serializedObj.clusterIdToMemberContextListMap, clusterIdToMemberContextListMap);
+ copyMap(serializedObj.memberIdToMemberContextMap, memberIdToMemberContextMap);
+ copyMap(serializedObj.memberIdToScheduledTaskMap, memberIdToScheduledTaskMap);
+ copyMap(serializedObj.kubClusterIdToKubClusterContextMap, kubClusterIdToKubClusterContextMap);
+ copyMap(serializedObj.clusterIdToContextMap, clusterIdToContextMap);
+ copyMap(serializedObj.cartridgeTypeToPartitionIdsMap, cartridgeTypeToPartitionIdsMap);
+
+ copyList(serializedObj.getCartridges(), cartridges);
+ copyList(serializedObj.getServiceGroups(), serviceGroups);
if (log.isDebugEnabled()) {
log.debug("Cloud controller context is read from the registry");