From 2e3326ce101af3590928e456dc36b32b20883b35 Mon Sep 17 00:00:00 2001
From: ihsan demir <ihsan@hazelcast.com>
Date: Thu, 21 Dec 2017 18:14:31 +0300
Subject: [PATCH] Removed connection resets. Added connection alive check to be
 used in addition to the null check at the ClusterListenerThread thread loop.

The problem case:
1. Due to connection reset, the connection is destroyed and the underlying receiveBuffer is deleted.
2.  ClusterListenerThread is still at listenMembershipEvents call blocked at the readBlocking call which uses the deleted receiveBuffer of the connection. The receiveBuffer is accessed after the blocking read and this is an illegal memory access.
---
 .../src/hazelcast/client/connection/ClusterListenerThread.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/hazelcast/src/hazelcast/client/connection/ClusterListenerThread.cpp b/hazelcast/src/hazelcast/client/connection/ClusterListenerThread.cpp
index c6644bfd0b..97246f5a1a 100644
--- a/hazelcast/src/hazelcast/client/connection/ClusterListenerThread.cpp
+++ b/hazelcast/src/hazelcast/client/connection/ClusterListenerThread.cpp
@@ -57,7 +57,7 @@ namespace hazelcast {
                 spi::LifecycleService &lifecycleService = clientContext.getLifecycleService();
                 while (lifecycleService.isRunning()) {
                     try {
-                        if (conn.get() == NULL) {
+                        if (conn.get() == NULL || !conn->live) {
                             try {
                                 conn = clientContext.getClusterService().connectToOne(previousConnectionAddrPtr);
                                 previousConnectionAddr = conn->getRemoteEndpoint();
@@ -94,7 +94,6 @@ namespace hazelcast {
                         if (deletingConnection.compareAndSet(false, true)) {
                             if (conn.get()) {
                                 util::IOUtil::closeResource(conn.get(), "Error while listening cluster events");
-                                conn.reset();
                                 lifecycleService.fireLifecycleEvent(LifecycleEvent::CLIENT_DISCONNECTED);
                             }
                             deletingConnection = false;
@@ -111,7 +110,6 @@ namespace hazelcast {
                 if (deletingConnection.compareAndSet(false, true)) {
                     if (conn.get()) {
                         util::IOUtil::closeResource(conn.get(), "Cluster listener thread is stopping");
-                        conn.reset();
                         clientContext.getLifecycleService().fireLifecycleEvent(LifecycleEvent::CLIENT_DISCONNECTED);
                     }
                     deletingConnection = false;