stratos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From im...@apache.org
Subject stratos git commit: Fixing Member.initTime setting logic
Date Sun, 21 Dec 2014 20:12:34 GMT
Repository: stratos
Updated Branches:
  refs/heads/master 7b98860ad -> 519c282b4


Fixing Member.initTime setting logic


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

Branch: refs/heads/master
Commit: 519c282b47cadd4b6826f426da8f267b06d11fee
Parents: 7b98860
Author: Imesh Gunaratne <imesh@apache.org>
Authored: Mon Dec 22 01:42:10 2014 +0530
Committer: Imesh Gunaratne <imesh@apache.org>
Committed: Mon Dec 22 01:42:26 2014 +0530

----------------------------------------------------------------------
 .../org/apache/stratos/cloud/controller/iaases/KubernetesIaas.java | 2 +-
 .../cloud/controller/services/impl/CloudControllerServiceImpl.java | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/519c282b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/KubernetesIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/KubernetesIaas.java
b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/KubernetesIaas.java
index 3ff2dac..8e57ba9 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/KubernetesIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/KubernetesIaas.java
@@ -238,7 +238,7 @@ public class KubernetesIaas extends Iaas {
         newMemberContext.setPrivateIPs(new String[]{pod.getCurrentState().getHostIP()});
         newMemberContext.setDefaultPublicIP(pod.getCurrentState().getHostIP());
         newMemberContext.setPublicIPs(new String[]{pod.getCurrentState().getHostIP()});
-        newMemberContext.setInitTime(System.currentTimeMillis());
+        newMemberContext.setInitTime(memberContext.getInitTime());
         newMemberContext.setProperties(memberContext.getProperties());
         return newMemberContext;
     }

http://git-wip-us.apache.org/repos/asf/stratos/blob/519c282b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
index 52d499f..bc80291 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
@@ -434,6 +434,7 @@ public class CloudControllerServiceImpl implements CloudControllerService
{
         memberContext.setNetworkPartitionId(instanceContext.getNetworkPartitionId());
         memberContext.setPartition(instanceContext.getPartition());
         memberContext.setProperties(instanceContext.getProperties());
+        memberContext.setInitTime(System.currentTimeMillis());
         return memberContext;
     }
 


Mime
View raw message