geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dschnei...@apache.org
Subject [2/2] incubator-geode git commit: removed all comments referring to isHostReachable
Date Tue, 13 Oct 2015 18:29:15 GMT
removed all comments referring to isHostReachable


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

Branch: refs/heads/feature/GEODE-397
Commit: 4a26338b1e888a02b0208be863637737737eab2d
Parents: f49c0d8
Author: Darrel Schneider <dschneider@pivotal.io>
Authored: Tue Oct 13 11:27:48 2015 -0700
Committer: Darrel Schneider <dschneider@pivotal.io>
Committed: Tue Oct 13 11:27:48 2015 -0700

----------------------------------------------------------------------
 .../gemfire/cache/client/internal/ConnectionImpl.java    | 11 -----------
 .../internal/cache/tier/sockets/CacheClientUpdater.java  |  5 -----
 .../com/gemstone/org/jgroups/stack/GossipClient.java     |  5 -----
 3 files changed, 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4a26338b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionImpl.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionImpl.java
index 59c6c17..7880821 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionImpl.java
@@ -89,11 +89,6 @@ public class ConnectionImpl implements Connection {
       ServerLocation location, HandShake handShake, int socketBufferSize,
       int handShakeTimeout, int readTimeout, byte communicationMode, GatewaySender sender,
SocketCreator sc)
       throws IOException {
-// commented out because isHostReachable always returns true
-//    if (!sc
-//        .isHostReachable(InetAddress.getByName(location.getHostName()))) {
-//      throw new NoRouteToHostException("Server is not reachable: " + location.getHostName());
-//    }
     theSocket = sc.connectForClient(
         location.getHostName(), location.getPort(), handShakeTimeout, socketBufferSize);
     theSocket.setTcpNoDelay(true);
@@ -126,12 +121,6 @@ public class ConnectionImpl implements Connection {
     
     try {
       // if a forced-disconnect has occurred, we can't send messages to anyone
-// commented out because isHostReachable always returns true
-//      SocketCreator sc = SocketCreator.getDefaultInstance();
-//      if (!sc.isHostReachable(this.theSocket.getInetAddress())) {
-//        return;
-//      }
-
       boolean sendCloseMsg = !TEST_DURABLE_CLIENT_CRASH;
       if (sendCloseMsg) {
         try {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4a26338b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientUpdater.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientUpdater.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientUpdater.java
index 1e1633d..3915465 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientUpdater.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientUpdater.java
@@ -309,11 +309,6 @@ public class CacheClientUpdater extends Thread implements ClientUpdater,
       int socketBufferSize = Integer.getInteger(
           "BridgeServer.SOCKET_BUFFER_SIZE", 32768).intValue();
 
-// commented out because isHostReachable always returns true
-//      if (!socketCreator.isHostReachable(InetAddress.getByName(location.getHostName())))
{
-//        throw new NoRouteToHostException("Server is not reachable: " + location.getHostName());
-//      }
-
       mySock = socketCreator.connectForClient(
           location.getHostName(), location.getPort(), handshakeTimeout, socketBufferSize);
       mySock.setTcpNoDelay(true);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4a26338b/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/stack/GossipClient.java
----------------------------------------------------------------------
diff --git a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/stack/GossipClient.java
b/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/stack/GossipClient.java
index a6985e6..74455fa 100644
--- a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/stack/GossipClient.java
+++ b/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/stack/GossipClient.java
@@ -283,9 +283,6 @@ public class GossipClient  {
                 if(log.isTraceEnabled())
                     log.trace("REGISTER_REQ --> " + entry.getIpAddress() + ':' + entry.getPort());
                 //sock=new Socket(entry.getIpAddress(), entry.getPort());
-                // GemStoneAddition - use SocketCreator
-                // commented out because isHostReachable always returns true
-                //if (JChannel.getGfFunctions().getSockCreator().isHostReachable(entry.getIpAddress()))
                 {
 
                   // Get GemFire version from IPAddress first
@@ -552,8 +549,6 @@ public class GossipClient  {
       if (log.isTraceEnabled())
         log.trace("GEMFIRE_VERSION --> " + entry.getIpAddress() + ':'
                 + +entry.getPort());
-      // commented out because isHostReachable always returns true
-      //if (JChannel.getGfFunctions().getSockCreator().isHostReachable(entry.getIpAddress()))
       {
   
         ConnectTimerTask timeoutTask = new ConnectTimerTask(); // GemStoneAddition


Mime
View raw message