You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/03/18 17:28:27 UTC
[4/8] incubator-geode git commit: GEODE-515 Make sure that we connect
to DS using same udp port.
GEODE-515 Make sure that we connect to DS using same udp port.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/397a42db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/397a42db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/397a42db
Branch: refs/heads/feature/GEODE-1050
Commit: 397a42db76b6124e47ffc5c08cbde4dfd73f475c
Parents: 22b4330
Author: Hitesh Khamesra <hk...@pivotal.io>
Authored: Wed Mar 16 15:40:54 2016 -0700
Committer: Hitesh Khamesra <hk...@pivotal.io>
Committed: Fri Mar 18 09:23:22 2016 -0700
----------------------------------------------------------------------
.../internal/membership/gms/messenger/JGroupsMessenger.java | 1 +
.../gemfire/distributed/internal/DistributionManagerDUnitTest.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/397a42db/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
index d95d8df..9476deb 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
@@ -236,6 +236,7 @@ public class JGroupsMessenger implements Messenger {
int port = Integer.getInteger("gemfire.jg-bind-port", 0);
if (port != 0) {
properties = replaceStrings(properties, "MEMBERSHIP_PORT_RANGE_START", ""+port);
+ properties = replaceStrings(properties, "MEMBERSHIP_PORT_RANGE_END", ""+0);
} else {
int[] ports = dc.getMembershipPortRange();
properties = replaceStrings(properties, "MEMBERSHIP_PORT_RANGE_START", ""+ports[0]);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/397a42db/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java
index 2164fdc..25eec69 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java
@@ -144,7 +144,7 @@ public class DistributionManagerDUnitTest extends DistributedTestCase {
MembershipManager mgr = MembershipManagerHelper.getMembershipManager(sys);
InternalDistributedMember idm = mgr.getLocalMember();
// TODO GMS needs to have a system property allowing the bind-port to be set
-// System.setProperty("gemfire.jg-bind-port", ""+idm.getPort());
+ System.setProperty("gemfire.jg-bind-port", ""+idm.getPort());
try {
sys.disconnect();
sys = getSystem();