geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [13/19] geode git commit: GEODE-2751 UniversalMembershipListenerAdapterDUnitTest.testSystemClientEventsInServer
Date Fri, 07 Apr 2017 19:34:12 GMT
GEODE-2751 UniversalMembershipListenerAdapterDUnitTest.testSystemClientEventsInServer

adding files not included in 02a31e22ad350a84ea2797562d13c6b16262481b


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

Branch: refs/heads/feature/GEODE-2632
Commit: 534bb8f9ebbae8291687bb7fa1ea0fd9c17c7e7f
Parents: 02a31e2
Author: Bruce Schuchardt <bschuchardt@pivotal.io>
Authored: Wed Apr 5 11:09:17 2017 -0700
Committer: Bruce Schuchardt <bschuchardt@pivotal.io>
Committed: Wed Apr 5 11:09:17 2017 -0700

----------------------------------------------------------------------
 .../modules/session/Tomcat8SessionsClientServerDUnitTest.java   | 1 -
 .../geode/distributed/internal/LonerDistributionManager.java    | 4 +++-
 .../main/java/org/apache/geode/internal/net/SocketCreator.java  | 5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/534bb8f9/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
b/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
index e475f40..21f0aaa 100644
--- a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
+++ b/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
@@ -15,7 +15,6 @@
 package org.apache.geode.modules.session;
 
 import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.internal.cache.CacheServerLauncher.serverPort;
 
 import java.util.List;
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/geode/blob/534bb8f9/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
index 2b6bae2..af4e674 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
@@ -1173,7 +1173,9 @@ public class LonerDistributionManager implements DM {
 
       String name = this.system.getName();
 
-      host = SocketCreator.getLocalHost().getCanonicalHostName();
+      InetAddress hostAddr = SocketCreator.getLocalHost();
+      host = SocketCreator.use_client_host_name ? hostAddr.getCanonicalHostName()
+          : hostAddr.getHostAddress();
       DistributionConfig config = system.getConfig();
       DurableClientAttributes dac = null;
       if (config.getDurableClientId() != null) {

http://git-wip-us.apache.org/repos/asf/geode/blob/534bb8f9/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java b/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
index 7a8f3ad..82e36ab 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
@@ -157,6 +157,11 @@ public class SocketCreator {
   public static volatile boolean resolve_dns = true;
 
   /**
+   * set this to false to use an inet_addr in a client's ID
+   */
+  public static volatile boolean use_client_host_name = true;
+
+  /**
    * True if this SocketCreator has been initialized and is ready to use
    */
   private boolean ready = false;


Mime
View raw message