geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From echobr...@apache.org
Subject [geode-native] 01/05: GEODE-4697: Rename ClientHandShake to ServerSideHandshake
Date Thu, 22 Feb 2018 03:17:22 GMT
This is an automated email from the ASF dual-hosted git repository.

echobravo pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git

commit 8c8f4d97d1e7dafc2e94a78bce2df68427bc647a
Author: Michael Oleske <moleske@pivotal.io>
AuthorDate: Fri Feb 16 14:23:21 2018 -0800

    GEODE-4697: Rename ClientHandShake to ServerSideHandshake
    
    - remove unused FunctionExcuteTimeOut
    
    Signed-off-by: Ryan McMahon <rmcmahon@pivotal.io>
---
 .../testThinClientPoolExecuteFunctionThrowsException.cpp       |  1 -
 tests/javaobject/FunctionExecutionTimeOut.java                 | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/cppcache/integration-test/testThinClientPoolExecuteFunctionThrowsException.cpp
b/cppcache/integration-test/testThinClientPoolExecuteFunctionThrowsException.cpp
index 3ac044c..2e43bc5 100644
--- a/cppcache/integration-test/testThinClientPoolExecuteFunctionThrowsException.cpp
+++ b/cppcache/integration-test/testThinClientPoolExecuteFunctionThrowsException.cpp
@@ -57,7 +57,6 @@ char* exFuncNamePdxType = (char*)"PdxFunctionTest";
 char* FEOnRegionPrSHOP = (char*)"FEOnRegionPrSHOP";
 char* FEOnRegionPrSHOP_OptimizeForWrite =
     (char*)"FEOnRegionPrSHOP_OptimizeForWrite";
-char* FETimeOut = (char*)"FunctionExecutionTimeOut";
 
 #define verifyGetResults()                                                     \
   bool found = false;                                                          \
diff --git a/tests/javaobject/FunctionExecutionTimeOut.java b/tests/javaobject/FunctionExecutionTimeOut.java
index a2b6fd4..c5b8c8f 100644
--- a/tests/javaobject/FunctionExecutionTimeOut.java
+++ b/tests/javaobject/FunctionExecutionTimeOut.java
@@ -34,7 +34,7 @@ import org.apache.geode.internal.cache.PartitionedRegion;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
 import org.apache.geode.internal.cache.CacheServerImpl;
 
-import org.apache.geode.internal.cache.tier.ClientHandShake;
+import org.apache.geode.internal.cache.tier.ServerSideHandshake;
 import org.apache.geode.internal.cache.tier.sockets.AcceptorImpl;
 import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
 import org.apache.geode.LogWriter;
@@ -54,11 +54,11 @@ public class FunctionExecutionTimeOut extends FunctionAdapter implements
     AcceptorImpl acceptor = ((CacheServerImpl) cache.getCacheServers().get(0)).getAcceptor();
     ServerConnection[] scs = acceptor.getAllServerConnectionList();
     for (int i = 0; i < scs.length; ++i) {
-      ClientHandShake hs = scs[i].getHandshake();
-	  if (hs != null) {
-	    logger.info("hs.getClientReadTimeout() =  " + hs.getClientReadTimeout());
+      ServerSideHandshake handshake = scs[i].getHandshake();
+	  if (handshake != null) {
+	    logger.info("handshake.getClientReadTimeout() =  " + handshake.getClientReadTimeout());
 	  }
-      if (hs != null && expected == hs.getClientReadTimeout()) {
+      if (handshake != null && expected == handshake.getClientReadTimeout()) {
         // success
 		timeoutFound = true;
 		break;

-- 
To stop receiving notification emails like this one, please contact
echobravo@apache.org.

Mime
View raw message