This is an automated email from the ASF dual-hosted git repository. onichols pushed a commit to branch release/1.9.1 in repository https://gitbox.apache.org/repos/asf/geode.git
commit 5dfad63e4e43a693556c8f2e011b43006ab8e68a Author: Bruce Schuchardt <[email protected]> AuthorDate: Thu Jun 27 14:34:43 2019 -0700 Revert "GEODE-6468 [CI Failure] ClusterCommunicationsDUnitTest fails on createEntryAndVerifyUpdate" This reverts commit 6d1d82a15a5c548b2aafeff8bf023d12044581e7. --- .../java/org/apache/geode/ClusterCommunicationsDUnitTest.java | 11 +++++------ .../main/java/org/apache/geode/internal/tcp/Connection.java | 10 +++++----- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java index 1568740..c970f77 100644 --- a/geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java +++ b/geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java @@ -70,7 +70,6 @@ import org.apache.geode.distributed.internal.membership.gms.membership.GMSJoinLe import org.apache.geode.internal.DSFIDFactory; import org.apache.geode.internal.cache.DirectReplyMessage; import org.apache.geode.test.dunit.Host; -import org.apache.geode.test.dunit.IgnoredException; import org.apache.geode.test.dunit.Invoke; import org.apache.geode.test.dunit.VM; import org.apache.geode.test.dunit.rules.DistributedRule; @@ -127,7 +126,7 @@ public class ClusterCommunicationsDUnitTest implements java.io.Serializable { @Rule public final SerializableTestName testName = new SerializableTestName(); - private final String regionName = "clusterTestRegion"; + final String regionName = "clusterTestRegion"; public ClusterCommunicationsDUnitTest(RunConfiguration runConfiguration) { this.useSSL = runConfiguration.useSSL; @@ -142,8 +141,6 @@ public class ClusterCommunicationsDUnitTest implements java.io.Serializable { this.useSSL = testWithSSL; this.conserveSockets = testWithConserveSocketsTrue; }); - IgnoredException.addIgnoredException("Socket Closed"); - IgnoredException.addIgnoredException("Remote host closed connection during handshake"); } @Test @@ -189,7 +186,7 @@ public class ClusterCommunicationsDUnitTest implements java.io.Serializable { VM.getVM(1).invoke("receive a large direct-reply message", () -> { SerialAckedMessageWithBigReply messageWithBigReply = new SerialAckedMessageWithBigReply(); await().until(() -> { - messageWithBigReply.send(Collections.singleton(vm2ID)); + messageWithBigReply.send(Collections.<DistributedMember>singleton(vm2ID)); return true; }); }); @@ -231,7 +228,9 @@ public class ClusterCommunicationsDUnitTest implements java.io.Serializable { createCacheAndRegion(server2VM, locatorPort); // roll server1 to the current version - server1VM.invoke("stop server1", () -> cache.close()); + server1VM.invoke("stop server1", () -> { + cache.close(); + }); server1VM = Host.getHost(0).getVM(VersionManager.CURRENT_VERSION, 1); createCacheAndRegion(server1VM, locatorPort); diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java index 2ba313e..e659496 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java +++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java @@ -756,11 +756,6 @@ public class Connection implements Runnable { } private void notifyHandshakeWaiter(boolean success) { - if (getConduit().useSSL() && ioFilter != null) { - // clear out any remaining handshake bytes - ByteBuffer buffer = ioFilter.getUnwrappedBuffer(inputBuffer); - buffer.position(0).limit(0); - } synchronized (this.handshakeSync) { if (success) { this.handshakeRead = true; @@ -1593,6 +1588,11 @@ public class Connection implements Runnable { } asyncClose(false); this.owner.removeAndCloseThreadOwnedSockets(); + } else { + if (getConduit().useSSL()) { + ByteBuffer buffer = ioFilter.getUnwrappedBuffer(inputBuffer); + buffer.position(0).limit(0); + } } releaseInputBuffer();
