You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bs...@apache.org on 2019/07/30 20:19:39 UTC

[geode] branch feature/GEODE-6976 created (now 924e879)

This is an automated email from the ASF dual-hosted git repository.

bschuchardt pushed a change to branch feature/GEODE-6976
in repository https://gitbox.apache.org/repos/asf/geode.git.


      at 924e879  GEODE-6976 org.apache.geode.internal.net.SSLSocketIntegrationTest > testSecuredSocketTransmissionShouldWorkUsingNIO FAILED

This branch includes the following new commits:

     new 924e879  GEODE-6976 org.apache.geode.internal.net.SSLSocketIntegrationTest > testSecuredSocketTransmissionShouldWorkUsingNIO FAILED

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[geode] 01/01: GEODE-6976 org.apache.geode.internal.net.SSLSocketIntegrationTest > testSecuredSocketTransmissionShouldWorkUsingNIO FAILED

Posted by bs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bschuchardt pushed a commit to branch feature/GEODE-6976
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 924e879092d4cf09f193a484758553fffc68c3e0
Author: Bruce Schuchardt <bs...@pivotal.io>
AuthorDate: Tue Jul 30 13:16:35 2019 -0700

    GEODE-6976 org.apache.geode.internal.net.SSLSocketIntegrationTest > testSecuredSocketTransmissionShouldWorkUsingNIO FAILED
    
    This test failed if the first read from the server socket happened to
    read two messages instead of one.  This change lets the server thread
    read the second message by leaving the decoded buffer's position
    unchanged if there is more data to read.
---
 .../java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
index 5a09285..0ae31a5 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
@@ -312,7 +312,9 @@ public class SSLSocketIntegrationTest {
     ByteBufferInputStream bbis = new ByteBufferInputStream(unwrapped);
     DataInputStream dis = new DataInputStream(bbis);
     String welcome = dis.readUTF();
-    engine.doneReading(unwrapped);
+    if (unwrapped.position() >= unwrapped.limit()) {
+      unwrapped.position(0).limit(unwrapped.capacity());
+    }
     assertThat(welcome).isEqualTo("Hello world");
     System.out.println("server read Hello World message from client");
   }