Merge pull request #2897 from chrisdennis/ensure-close-on-reconnect

Ensure previous connection is fully closed before starting reconnection
ehcache · Apr 16, 2021 · bc0050c · bc0050c
2 parents b699114 + c12108a
commit bc0050c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...d/client/src/main/java/org/ehcache/clustered/client/internal/service/ConnectionState.java b/...d/client/src/main/java/org/ehcache/clustered/client/internal/service/ConnectionState.java
@@ -139,6 +139,12 @@ public void initClusterConnection(Executor asyncWorker) {
   private void reconnect() {
     while (true) {
       try {
+        try {
+          //Ensure full closure of existing connection
+          clusterConnection.close();
+        } catch (IOException | ConnectionClosedException | IllegalStateException e) {
+          LOGGER.debug("Exception closing previous cluster connection", e);
+        }
         connect();
         LOGGER.info("New connection to server is established, reconnect count is {}", reconnectCounter.incrementAndGet());
         break;

diff --git a/...c/main/java/org/ehcache/clustered/client/internal/store/ReconnectingServerStoreProxy.java b/...c/main/java/org/ehcache/clustered/client/internal/store/ReconnectingServerStoreProxy.java
@@ -148,12 +148,11 @@ private interface TimeoutExceptionFunction<U, V> {
     V apply(U u) throws TimeoutException;
   }
 
-  private static class ReconnectInProgressProxy extends LockingServerStoreProxyImpl {
+  private static class ReconnectInProgressProxy implements LockingServerStoreProxy {
 
     private final String cacheId;
 
     ReconnectInProgressProxy(String cacheId) {
-      super(null, null);
       this.cacheId = cacheId;
     }
 
@@ -206,6 +205,11 @@ public ChainEntry lock(long key) {
     public void unlock(long key, boolean localonly) {
       throw new ReconnectInProgressException();
     }
+
+    @Override
+    public void enableEvents(boolean enable) {
+      throw new ReconnectInProgressException();
+    }
   }
 
   private LockingServerStoreProxy unsupportedLocking(ServerStoreProxy serverStoreProxy) {