You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by sa...@apache.org on 2016/06/17 23:45:20 UTC

incubator-geode git commit: removed code to change default mcast address based on machine

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-1493 74a8b79db -> 7fde35b07


removed code to change default mcast address based on machine


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

Branch: refs/heads/feature/GEODE-1493
Commit: 7fde35b072ba7e7cf1e098088f710dd06d5123a1
Parents: 74a8b79
Author: Sai Boorlagadda <sb...@pivotal.io>
Authored: Thu Jun 16 20:49:11 2016 -0700
Committer: Sai Boorlagadda <sb...@pivotal.io>
Committed: Thu Jun 16 20:49:11 2016 -0700

----------------------------------------------------------------------
 .../distributed/internal/AbstractDistributionConfig.java    | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7fde35b0/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
index c7eca0f..01c893f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
@@ -1148,12 +1148,9 @@ public abstract class AbstractDistributionConfig
   }
 
   public static final InetAddress _getDefaultMcastAddress() {
-    String ipLiteral;
-    if ( SocketCreator.preferIPv6Addresses() ) {
-      ipLiteral = "FF38::1234"; // fix for bug 30014
-    } else {
-      ipLiteral = "239.192.81.1"; // fix for bug 30014
-    }
+    //Default MCast address can be just IPv4 address.
+    //On IPv6 machines, JGroups converts IPv4 address to equivalent IPv6 address.
+    String ipLiteral = "239.192.81.1";
     try {
       return InetAddress.getByName(ipLiteral);
     } catch (UnknownHostException ex) {