You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jc...@apache.org on 2015/09/25 20:38:09 UTC

incubator-geode git commit: GEODE-77: minor bug fixes.

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-77 ad7fc9ce8 -> 01907e688


GEODE-77: minor bug fixes.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/01907e68
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/01907e68
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/01907e68

Branch: refs/heads/feature/GEODE-77
Commit: 01907e688070ba47c59d75b94f5e5dd6a1ed1ff2
Parents: ad7fc9c
Author: Jianxia Chen <jc...@pivotal.io>
Authored: Fri Sep 25 11:37:19 2015 -0700
Committer: Jianxia Chen <jc...@pivotal.io>
Committed: Fri Sep 25 11:37:19 2015 -0700

----------------------------------------------------------------------
 .../internal/membership/gms/fd/GMSHealthMonitor.java           | 6 ++----
 .../membership/gms/messages/SuspectMembersMessage.java         | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/01907e68/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
index 19ef50f..f12628a 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
@@ -652,8 +652,7 @@ public class GMSHealthMonitor implements HealthMonitor, MessageHandler {
         viewVsMembers = new HashSet<SuspectRequest>();
         viewVsSuspectedMembers.put(cv, viewVsMembers);
       }
-      for (int i = 0; i < sMembers.size(); i++) {
-        SuspectRequest sr = sMembers.get(i);
+      for (SuspectRequest sr: sMembers) {       
         if (!viewVsMembers.contains(sr)) {
           viewVsMembers.add(sr);
         }
@@ -806,8 +805,7 @@ public class GMSHealthMonitor implements HealthMonitor, MessageHandler {
     logger.debug("Sending suspect request for members {}", requests);
     synchronized (suspectRequests) {
       if (suspectRequests.size() > 0) {
-        for (int i = 0; i < suspectRequests.size(); i++) {
-          SuspectRequest sr = suspectRequests.get(0);
+        for (SuspectRequest sr: suspectRequests) {
           if (!requests.contains(sr)) {
             requests.add(sr);
           }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/01907e68/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/SuspectMembersMessage.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/SuspectMembersMessage.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/SuspectMembersMessage.java
index 1c69b47..117f440 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/SuspectMembersMessage.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/SuspectMembersMessage.java
@@ -54,8 +54,7 @@ public class SuspectMembersMessage extends HighPriorityDistributionMessage {
   public void toData(DataOutput out) throws IOException {
     if (suspectRequests != null) {
       out.writeInt(suspectRequests.size());
-      for (int i = 0; i < suspectRequests.size(); i++) {
-        SuspectRequest sr = suspectRequests.get(0);
+      for (SuspectRequest sr: suspectRequests) {        
         DataSerializer.writeObject(sr.getSuspectMember(), out);
         DataSerializer.writeString(sr.getReason(), out);
       }