[geode] 02/02: GEODE-9141: (2 of 2) Handle in-buffer concurrency * Connection uses a ByteBufferVendor to mediate access to inputBuffer * Prevent return to pool before socket closer is finished

2021-06-28 Thread burcham 
This is an automated email from the ASF dual-hosted git repository.

burcham pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 924a610a7c6517c768069ce1e1939fb4b2b67cd0
Author: Bill Burcham 
AuthorDate: Sat Apr 17 09:12:13 2021 -0700

GEODE-9141: (2 of 2) Handle in-buffer concurrency
* Connection uses a ByteBufferVendor to mediate access to inputBuffer
* Prevent return to pool before socket closer is finished

(cherry picked from commit 9d0d4d1d33794d0f6a21c3bcae71e965cbbd7fbd)
(cherry picked from commit 9e8b3972fcf449eed4d41c254cf3f553e517eaa1)
(cherry picked from commit c4730deed48bb4513bd04486d4e8c09cdd3bb5a9)
---
 ...LSocketHostNameVerificationIntegrationTest.java |   6 +-
 .../internal/net/SSLSocketIntegrationTest.java |   3 +-
 .../apache/geode/codeAnalysis/excludedClasses.txt  |   2 +-
 .../geode/internal/net/ByteBufferSharing.java  |  15 +
 .../geode/internal/net/ByteBufferSharingNoOp.java  |   5 +
 .../geode/internal/net/ByteBufferVendor.java   | 144 ++---
 .../apache/geode/internal/net/NioSslEngine.java|  50 ++-
 .../apache/geode/internal/net/SocketCreator.java   |   9 +-
 .../org/apache/geode/internal/tcp/Connection.java  | 334 +++--
 .../geode/internal/net/ByteBufferVendorTest.java   |  36 ++-
 .../geode/internal/net/NioSslEngineTest.java   |  41 +--
 .../apache/geode/internal/tcp/ConnectionTest.java  |   1 +
 12 files changed, 361 insertions(+), 285 deletions(-)

diff --git 
a/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
 
b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
index a70f3b1..e86bfea 100755
--- 
a/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
+++ 
b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
@@ -103,6 +103,9 @@ public class SSLSocketHostNameVerificationIntegrationTest {
 
   @Before
   public void setUp() throws Exception {
+
+SocketCreatorFactory.close(); // to clear socket creators made in previous 
tests
+
 IgnoredException.addIgnoredException("javax.net.ssl.SSLException: Read 
timed out");
 
 this.localHost = InetAddress.getLoopbackAddress();
@@ -172,7 +175,7 @@ public class SSLSocketHostNameVerificationIntegrationTest {
 
 try {
   this.socketCreator.handshakeSSLSocketChannel(clientSocket.getChannel(),
-  sslEngine, 0, true,
+  sslEngine, 0,
   ByteBuffer.allocate(sslEngine.getSession().getPacketBufferSize()),
   new BufferPool(mock(DMStats.class)));
 
@@ -205,7 +208,6 @@ public class SSLSocketHostNameVerificationIntegrationTest {
 sc.handshakeSSLSocketChannel(socket.getChannel(),
 sslEngine,
 timeoutMillis,
-false,
 
ByteBuffer.allocate(sslEngine.getSession().getPacketBufferSize()),
 new BufferPool(mock(DMStats.class)));
   } catch (Throwable throwable) {
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 e7ac191..13e9d5b 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
@@ -217,7 +217,7 @@ public class SSLSocketIntegrationTest {
 clientSocket = clientChannel.socket();
 NioSslEngine engine =
 
clusterSocketCreator.handshakeSSLSocketChannel(clientSocket.getChannel(),
-clusterSocketCreator.createSSLEngine("localhost", 1234, true), 0, 
true,
+clusterSocketCreator.createSSLEngine("localhost", 1234, true), 0,
 ByteBuffer.allocate(65535), new BufferPool(mock(DMStats.class)));
 clientChannel.configureBlocking(true);
 
@@ -267,7 +267,6 @@ public class SSLSocketIntegrationTest {
 sc.handshakeSSLSocketChannel(socket.getChannel(), 
sc.createSSLEngine("localhost", 1234,
 false),
 timeoutMillis,
-false,
 ByteBuffer.allocate(65535),
 new BufferPool(mock(DMStats.class)));
 
diff --git 
a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
 
b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
index af3bd1e..cd1af3a 100644
--- 
a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
+++ 
b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
@@ -104,4 +104,4 @@ org/apache/geode/cache/query/internal/xml/ElementType

[geode] 02/02: GEODE-9141: (2 of 2) Handle in-buffer concurrency * Connection uses a ByteBufferVendor to mediate access to inputBuffer * Prevent return to pool before socket closer is finished

2021-06-28 Thread burcham 
This is an automated email from the ASF dual-hosted git repository.

burcham pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 4ef2bcd4962bc9506c2b7eec2fdab8467759488f
Author: Bill Burcham 
AuthorDate: Sat Apr 17 09:12:13 2021 -0700

GEODE-9141: (2 of 2) Handle in-buffer concurrency
* Connection uses a ByteBufferVendor to mediate access to inputBuffer
* Prevent return to pool before socket closer is finished

(cherry picked from commit 9d0d4d1d33794d0f6a21c3bcae71e965cbbd7fbd)
(cherry picked from commit 9e8b3972fcf449eed4d41c254cf3f553e517eaa1)
---
 ...LSocketHostNameVerificationIntegrationTest.java |   6 +-
 .../internal/net/SSLSocketIntegrationTest.java |   3 +-
 .../apache/geode/codeAnalysis/excludedClasses.txt  |   2 +-
 .../geode/internal/net/ByteBufferSharing.java  |  15 ++
 .../geode/internal/net/ByteBufferSharingNoOp.java  |   5 +
 .../geode/internal/net/ByteBufferVendor.java   | 144 ++
 .../apache/geode/internal/net/NioSslEngine.java|  50 ++--
 .../apache/geode/internal/net/SocketCreator.java   |   5 +-
 .../org/apache/geode/internal/tcp/Connection.java  | 299 ++---
 .../geode/internal/net/ByteBufferVendorTest.java   |  36 +--
 .../geode/internal/net/NioSslEngineTest.java   |  41 +--
 .../apache/geode/internal/tcp/ConnectionTest.java  |   1 +
 12 files changed, 340 insertions(+), 267 deletions(-)

diff --git 
a/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
 
b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
index a70f3b1..e86bfea 100755
--- 
a/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
+++ 
b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
@@ -103,6 +103,9 @@ public class SSLSocketHostNameVerificationIntegrationTest {
 
   @Before
   public void setUp() throws Exception {
+
+SocketCreatorFactory.close(); // to clear socket creators made in previous 
tests
+
 IgnoredException.addIgnoredException("javax.net.ssl.SSLException: Read 
timed out");
 
 this.localHost = InetAddress.getLoopbackAddress();
@@ -172,7 +175,7 @@ public class SSLSocketHostNameVerificationIntegrationTest {
 
 try {
   this.socketCreator.handshakeSSLSocketChannel(clientSocket.getChannel(),
-  sslEngine, 0, true,
+  sslEngine, 0,
   ByteBuffer.allocate(sslEngine.getSession().getPacketBufferSize()),
   new BufferPool(mock(DMStats.class)));
 
@@ -205,7 +208,6 @@ public class SSLSocketHostNameVerificationIntegrationTest {
 sc.handshakeSSLSocketChannel(socket.getChannel(),
 sslEngine,
 timeoutMillis,
-false,
 
ByteBuffer.allocate(sslEngine.getSession().getPacketBufferSize()),
 new BufferPool(mock(DMStats.class)));
   } catch (Throwable throwable) {
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 add6b9a..5415f4e 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
@@ -227,7 +227,7 @@ public class SSLSocketIntegrationTest {
 clientSocket = clientChannel.socket();
 NioSslEngine engine =
 
clusterSocketCreator.handshakeSSLSocketChannel(clientSocket.getChannel(),
-clusterSocketCreator.createSSLEngine("localhost", 1234, true), 0, 
true,
+clusterSocketCreator.createSSLEngine("localhost", 1234, true), 0,
 ByteBuffer.allocate(65535), new BufferPool(mock(DMStats.class)));
 clientChannel.configureBlocking(true);
 
@@ -279,7 +279,6 @@ public class SSLSocketIntegrationTest {
 engine =
 sc.handshakeSSLSocketChannel(socket.getChannel(), sslEngine,
 timeoutMillis,
-false,
 ByteBuffer.allocate(65535),
 new BufferPool(mock(DMStats.class)));
 final List serverNames = 
sslEngine.getSSLParameters().getServerNames();
diff --git 
a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
 
b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
index 33f43c3..a96907f 100644
--- 
a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
+++ 
b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
@@ -104,4 +104,4 @@ org/apache/geode/cache/query/internal/xml/ElementType

[geode] 02/02: GEODE-9141: (2 of 2) Handle in-buffer concurrency * Connection uses a ByteBufferVendor to mediate access to inputBuffer * Prevent return to pool before socket closer is finished

2021-06-17 Thread burcham 
This is an automated email from the ASF dual-hosted git repository.

burcham pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 1a8eb5aec580eb75871060793ea65d62f5f2d959
Author: Bill Burcham 
AuthorDate: Sat Apr 17 09:12:13 2021 -0700

GEODE-9141: (2 of 2) Handle in-buffer concurrency
* Connection uses a ByteBufferVendor to mediate access to inputBuffer
* Prevent return to pool before socket closer is finished

(cherry picked from commit 9d0d4d1d33794d0f6a21c3bcae71e965cbbd7fbd)
(cherry picked from commit 9e8b3972fcf449eed4d41c254cf3f553e517eaa1)
(cherry picked from commit c4730deed48bb4513bd04486d4e8c09cdd3bb5a9)
---
 ...LSocketHostNameVerificationIntegrationTest.java |   6 +-
 .../internal/net/SSLSocketIntegrationTest.java |   3 +-
 .../apache/geode/codeAnalysis/excludedClasses.txt  |   2 +-
 .../geode/internal/net/ByteBufferSharing.java  |  15 +
 .../geode/internal/net/ByteBufferSharingNoOp.java  |   5 +
 .../geode/internal/net/ByteBufferVendor.java   | 144 ++---
 .../apache/geode/internal/net/NioSslEngine.java|  50 ++-
 .../apache/geode/internal/net/SocketCreator.java   |   9 +-
 .../org/apache/geode/internal/tcp/Connection.java  | 334 +++--
 .../geode/internal/net/ByteBufferVendorTest.java   |  36 ++-
 .../geode/internal/net/NioSslEngineTest.java   |  41 +--
 .../apache/geode/internal/tcp/ConnectionTest.java  |   1 +
 12 files changed, 361 insertions(+), 285 deletions(-)

diff --git 
a/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
 
b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
index a70f3b1..e86bfea 100755
--- 
a/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
+++ 
b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
@@ -103,6 +103,9 @@ public class SSLSocketHostNameVerificationIntegrationTest {
 
   @Before
   public void setUp() throws Exception {
+
+SocketCreatorFactory.close(); // to clear socket creators made in previous 
tests
+
 IgnoredException.addIgnoredException("javax.net.ssl.SSLException: Read 
timed out");
 
 this.localHost = InetAddress.getLoopbackAddress();
@@ -172,7 +175,7 @@ public class SSLSocketHostNameVerificationIntegrationTest {
 
 try {
   this.socketCreator.handshakeSSLSocketChannel(clientSocket.getChannel(),
-  sslEngine, 0, true,
+  sslEngine, 0,
   ByteBuffer.allocate(sslEngine.getSession().getPacketBufferSize()),
   new BufferPool(mock(DMStats.class)));
 
@@ -205,7 +208,6 @@ public class SSLSocketHostNameVerificationIntegrationTest {
 sc.handshakeSSLSocketChannel(socket.getChannel(),
 sslEngine,
 timeoutMillis,
-false,
 
ByteBuffer.allocate(sslEngine.getSession().getPacketBufferSize()),
 new BufferPool(mock(DMStats.class)));
   } catch (Throwable throwable) {
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 e7ac191..13e9d5b 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
@@ -217,7 +217,7 @@ public class SSLSocketIntegrationTest {
 clientSocket = clientChannel.socket();
 NioSslEngine engine =
 
clusterSocketCreator.handshakeSSLSocketChannel(clientSocket.getChannel(),
-clusterSocketCreator.createSSLEngine("localhost", 1234, true), 0, 
true,
+clusterSocketCreator.createSSLEngine("localhost", 1234, true), 0,
 ByteBuffer.allocate(65535), new BufferPool(mock(DMStats.class)));
 clientChannel.configureBlocking(true);
 
@@ -267,7 +267,6 @@ public class SSLSocketIntegrationTest {
 sc.handshakeSSLSocketChannel(socket.getChannel(), 
sc.createSSLEngine("localhost", 1234,
 false),
 timeoutMillis,
-false,
 ByteBuffer.allocate(65535),
 new BufferPool(mock(DMStats.class)));
 
diff --git 
a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
 
b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
index af3bd1e..cd1af3a 100644
--- 
a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
+++ 
b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
@@ -104,4 +104,4 @@ org/apache/geode/cache/query/internal/xml/ElementType

[geode] 02/02: GEODE-9141: (2 of 2) Handle in-buffer concurrency * Connection uses a ByteBufferVendor to mediate access to inputBuffer * Prevent return to pool before socket closer is finished

2021-06-16 Thread burcham 
This is an automated email from the ASF dual-hosted git repository.

burcham pushed a commit to branch features/back-port-geode-9141-to-1-13
in repository https://gitbox.apache.org/repos/asf/geode.git

commit c4730deed48bb4513bd04486d4e8c09cdd3bb5a9
Author: Bill Burcham 
AuthorDate: Sat Apr 17 09:12:13 2021 -0700

GEODE-9141: (2 of 2) Handle in-buffer concurrency
* Connection uses a ByteBufferVendor to mediate access to inputBuffer
* Prevent return to pool before socket closer is finished

(cherry picked from commit 9d0d4d1d33794d0f6a21c3bcae71e965cbbd7fbd)
(cherry picked from commit 9e8b3972fcf449eed4d41c254cf3f553e517eaa1)
---
 ...LSocketHostNameVerificationIntegrationTest.java |   6 +-
 .../internal/net/SSLSocketIntegrationTest.java |   3 +-
 .../apache/geode/codeAnalysis/excludedClasses.txt  |   2 +-
 .../geode/internal/net/ByteBufferSharing.java  |  15 ++
 .../geode/internal/net/ByteBufferSharingNoOp.java  |   5 +
 .../geode/internal/net/ByteBufferVendor.java   | 144 ++
 .../apache/geode/internal/net/NioSslEngine.java|  50 ++--
 .../apache/geode/internal/net/SocketCreator.java   |   5 +-
 .../org/apache/geode/internal/tcp/Connection.java  | 299 ++---
 .../geode/internal/net/ByteBufferVendorTest.java   |  36 +--
 .../geode/internal/net/NioSslEngineTest.java   |  41 +--
 .../apache/geode/internal/tcp/ConnectionTest.java  |   1 +
 12 files changed, 340 insertions(+), 267 deletions(-)

diff --git 
a/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
 
b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
index a70f3b1..e86bfea 100755
--- 
a/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
+++ 
b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
@@ -103,6 +103,9 @@ public class SSLSocketHostNameVerificationIntegrationTest {
 
   @Before
   public void setUp() throws Exception {
+
+SocketCreatorFactory.close(); // to clear socket creators made in previous 
tests
+
 IgnoredException.addIgnoredException("javax.net.ssl.SSLException: Read 
timed out");
 
 this.localHost = InetAddress.getLoopbackAddress();
@@ -172,7 +175,7 @@ public class SSLSocketHostNameVerificationIntegrationTest {
 
 try {
   this.socketCreator.handshakeSSLSocketChannel(clientSocket.getChannel(),
-  sslEngine, 0, true,
+  sslEngine, 0,
   ByteBuffer.allocate(sslEngine.getSession().getPacketBufferSize()),
   new BufferPool(mock(DMStats.class)));
 
@@ -205,7 +208,6 @@ public class SSLSocketHostNameVerificationIntegrationTest {
 sc.handshakeSSLSocketChannel(socket.getChannel(),
 sslEngine,
 timeoutMillis,
-false,
 
ByteBuffer.allocate(sslEngine.getSession().getPacketBufferSize()),
 new BufferPool(mock(DMStats.class)));
   } catch (Throwable throwable) {
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 add6b9a..5415f4e 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
@@ -227,7 +227,7 @@ public class SSLSocketIntegrationTest {
 clientSocket = clientChannel.socket();
 NioSslEngine engine =
 
clusterSocketCreator.handshakeSSLSocketChannel(clientSocket.getChannel(),
-clusterSocketCreator.createSSLEngine("localhost", 1234, true), 0, 
true,
+clusterSocketCreator.createSSLEngine("localhost", 1234, true), 0,
 ByteBuffer.allocate(65535), new BufferPool(mock(DMStats.class)));
 clientChannel.configureBlocking(true);
 
@@ -279,7 +279,6 @@ public class SSLSocketIntegrationTest {
 engine =
 sc.handshakeSSLSocketChannel(socket.getChannel(), sslEngine,
 timeoutMillis,
-false,
 ByteBuffer.allocate(65535),
 new BufferPool(mock(DMStats.class)));
 final List serverNames = 
sslEngine.getSSLParameters().getServerNames();
diff --git 
a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
 
b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
index 33f43c3..a96907f 100644
--- 
a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
+++ 
b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
@@ -104,4 +104,4 @@ org/apache/geode/cache/query/internal/xml/ElementType

[geode] 02/02: GEODE-9141: (2 of 2) Handle in-buffer concurrency * Connection uses a ByteBufferVendor to mediate access to inputBuffer * Prevent return to pool before socket closer is finished

2021-05-04 Thread nnag 
This is an automated email from the ASF dual-hosted git repository.

nnag pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git

commit bd02d4aa0cba5ba02974feb8aa8bc86164f4159c
Author: Bill Burcham 
AuthorDate: Sat Apr 17 09:12:13 2021 -0700

GEODE-9141: (2 of 2) Handle in-buffer concurrency
* Connection uses a ByteBufferVendor to mediate access to inputBuffer
* Prevent return to pool before socket closer is finished

(cherry picked from commit 9d0d4d1d33794d0f6a21c3bcae71e965cbbd7fbd)
---
 ...LSocketHostNameVerificationIntegrationTest.java |   6 +-
 .../internal/net/SSLSocketIntegrationTest.java |   3 +-
 .../apache/geode/codeAnalysis/excludedClasses.txt  |   2 +-
 .../geode/internal/net/ByteBufferSharing.java  |  15 ++
 .../geode/internal/net/ByteBufferSharingNoOp.java  |   5 +
 .../geode/internal/net/ByteBufferVendor.java   | 146 
 .../apache/geode/internal/net/NioSslEngine.java|  50 ++---
 .../apache/geode/internal/net/SocketCreator.java   |   5 +-
 .../org/apache/geode/internal/tcp/Connection.java  | 250 ++---
 .../geode/internal/net/ByteBufferVendorTest.java   |  36 +--
 .../geode/internal/net/NioSslEngineTest.java   |  41 ++--
 .../apache/geode/internal/tcp/ConnectionTest.java  |   1 +
 12 files changed, 317 insertions(+), 243 deletions(-)

diff --git 
a/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
 
b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
index a70f3b1..e86bfea 100755
--- 
a/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
+++ 
b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
@@ -103,6 +103,9 @@ public class SSLSocketHostNameVerificationIntegrationTest {
 
   @Before
   public void setUp() throws Exception {
+
+SocketCreatorFactory.close(); // to clear socket creators made in previous 
tests
+
 IgnoredException.addIgnoredException("javax.net.ssl.SSLException: Read 
timed out");
 
 this.localHost = InetAddress.getLoopbackAddress();
@@ -172,7 +175,7 @@ public class SSLSocketHostNameVerificationIntegrationTest {
 
 try {
   this.socketCreator.handshakeSSLSocketChannel(clientSocket.getChannel(),
-  sslEngine, 0, true,
+  sslEngine, 0,
   ByteBuffer.allocate(sslEngine.getSession().getPacketBufferSize()),
   new BufferPool(mock(DMStats.class)));
 
@@ -205,7 +208,6 @@ public class SSLSocketHostNameVerificationIntegrationTest {
 sc.handshakeSSLSocketChannel(socket.getChannel(),
 sslEngine,
 timeoutMillis,
-false,
 
ByteBuffer.allocate(sslEngine.getSession().getPacketBufferSize()),
 new BufferPool(mock(DMStats.class)));
   } catch (Throwable throwable) {
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 add6b9a..5415f4e 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
@@ -227,7 +227,7 @@ public class SSLSocketIntegrationTest {
 clientSocket = clientChannel.socket();
 NioSslEngine engine =
 
clusterSocketCreator.handshakeSSLSocketChannel(clientSocket.getChannel(),
-clusterSocketCreator.createSSLEngine("localhost", 1234, true), 0, 
true,
+clusterSocketCreator.createSSLEngine("localhost", 1234, true), 0,
 ByteBuffer.allocate(65535), new BufferPool(mock(DMStats.class)));
 clientChannel.configureBlocking(true);
 
@@ -279,7 +279,6 @@ public class SSLSocketIntegrationTest {
 engine =
 sc.handshakeSSLSocketChannel(socket.getChannel(), sslEngine,
 timeoutMillis,
-false,
 ByteBuffer.allocate(65535),
 new BufferPool(mock(DMStats.class)));
 final List serverNames = 
sslEngine.getSSLParameters().getServerNames();
diff --git 
a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
 
b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
index 33f43c3..a96907f 100644
--- 
a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
+++ 
b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
@@ -104,4 +104,4 @@ org/apache/geode/cache/query/internal/xml/ElementType
 org/apache/geode/cache/query/internal/xml/ElementType$1
 org/apache/geode/cache/query/internal/xml/ElementType$2