geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jensde...@apache.org
Subject [30/50] [abbrv] incubator-geode git commit: recommitting 5b35e43f93bfbf6d62eadf7979eb3a8b7f59b77e and fixing compilation error
Date Mon, 21 Dec 2015 18:04:58 GMT
recommitting 5b35e43f93bfbf6d62eadf7979eb3a8b7f59b77e and fixing compilation error

GMSMembershipManager had unsaved changes in my Eclipse browser.  Not sure
why my pre-commit gradle build didn't catch that problem - sorry everyone.


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

Branch: refs/heads/feature/GEODE-14
Commit: 9efb5867db9d6fc02cccf78fb8da051e86ab6887
Parents: 4bf4557
Author: Bruce Schuchardt <bschuchardt@pivotal.io>
Authored: Tue Dec 15 08:31:53 2015 -0800
Committer: Bruce Schuchardt <bschuchardt@pivotal.io>
Committed: Tue Dec 15 08:31:53 2015 -0800

----------------------------------------------------------------------
 .../internal/membership/gms/mgr/GMSMembershipManager.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9efb5867/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
index 7be0a3a..56643ad 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
@@ -2213,7 +2213,7 @@ public class GMSMembershipManager implements MembershipManager, Manager
   /* non-thread-owned serial channels and high priority channels are not
    * included
    */
-  public Map getChannelStates(DistributedMember member, boolean includeMulticast) {
+  public Map getMessageState(DistributedMember member, boolean includeMulticast) {
     Map result = new HashMap();
     DirectChannel dc = directChannel;
     if (dc != null) {
@@ -2229,7 +2229,7 @@ public class GMSMembershipManager implements MembershipManager, Manager
     if (Thread.interrupted()) throw new InterruptedException();
     DirectChannel dc = directChannel;
     if (dc != null) {
-      dc.waitForChannelState(otherMember, channelState);
+      dc.waitForChannelState(otherMember, state);
     }
     services.getMessenger().waitForMessageState((InternalDistributedMember)otherMember, state);
   }


Mime
View raw message