You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2013/12/27 21:34:24 UTC
git commit: initializing load objects in member stat
Updated Branches:
refs/heads/master fa37baaa8 -> 122658996
initializing load objects in member stat
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/12265899
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/12265899
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/12265899
Branch: refs/heads/master
Commit: 12265899634d7dbd61d2fad0a3743a2c781b94b7
Parents: fa37baa
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sat Dec 28 02:09:01 2013 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sat Dec 28 02:09:01 2013 +0530
----------------------------------------------------------------------
.../stratos/autoscaler/MemberStatsContext.java | 18 ++++++++++--------
.../health/HealthEventMessageDelegator.java | 9 ---------
2 files changed, 10 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/12265899/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/MemberStatsContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/MemberStatsContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/MemberStatsContext.java
index 98b75dd..9877fe8 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/MemberStatsContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/MemberStatsContext.java
@@ -33,6 +33,8 @@ public class MemberStatsContext {
public MemberStatsContext(String memberId){
this.memberId = memberId;
+ memoryConsumption = new MemoryConsumption();
+ loadAverage = new LoadAverage();
}
public String getMemberId() {
@@ -47,16 +49,16 @@ public class MemberStatsContext {
public LoadAverage getLoadAverage() {
return loadAverage;
}
-
- public void setLoadAverage(LoadAverage loadAverage) {
- this.loadAverage = loadAverage;
- }
+//
+// public void setLoadAverage(LoadAverage loadAverage) {
+// this.loadAverage = loadAverage;
+// }
public MemoryConsumption getMemoryConsumption() {
return memoryConsumption;
}
-
- public void setMemoryConsumption(MemoryConsumption memoryConsumption) {
- this.memoryConsumption = memoryConsumption;
- }
+//
+// public void setMemoryConsumption(MemoryConsumption memoryConsumption) {
+// this.memoryConsumption = memoryConsumption;
+// }
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/12265899/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java
index e02f6a5..e99e839 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java
@@ -290,11 +290,6 @@ public class HealthEventMessageDelegator implements Runnable {
}
LoadAverage loadAverage = memberStatsContext.getLoadAverage();
-
- if(loadAverage == null) {
- loadAverage = new LoadAverage();
- memberStatsContext.setLoadAverage(loadAverage);
- }
return loadAverage;
}
@@ -336,10 +331,6 @@ public class HealthEventMessageDelegator implements Runnable {
}
MemoryConsumption memoryConsumption = memberStatsContext.getMemoryConsumption();
- if(memoryConsumption == null) {
- memoryConsumption = new MemoryConsumption();
- memberStatsContext.setMemoryConsumption(memoryConsumption);
- }
return memoryConsumption;
}