refactor:simplified the returning of connection from push client

tglman · tglman · commit 05eead9c11af · 2025-06-11T17:52:14.000+01:00
diff --git a/client/src/main/java/com/orientechnologies/orient/client/remote/ORemoteConnectionManager.java b/client/src/main/java/com/orientechnologies/orient/client/remote/ORemoteConnectionManager.java
@@ -155,17 +155,36 @@ public void remove(final OChannelBinaryAsynchClient conn) {
 
     pool.getPool().remove(conn);
 
+    try {
+      conn.close();
+    } catch (Exception e) {
+      OLogManager.instance().debug(this, "Cannot close connection", e);
+    }
+
     try {
       conn.unlock();
     } catch (Exception e) {
       OLogManager.instance().debug(this, "Cannot unlock connection lock", e);
     }
+  }
+
+  public void removeIfPresent(final OChannelBinaryAsynchClient conn) {
+    if (conn == null) return;
+
+    final ORemoteConnectionPool pool = connections.get(conn.getServerURL());
+    if (pool == null) return;
+    pool.getPool().remove(conn);
 
     try {
       conn.close();
     } catch (Exception e) {
       OLogManager.instance().debug(this, "Cannot close connection", e);
     }
+    try {
+      conn.unlock();
+    } catch (Exception e) {
+      OLogManager.instance().debug(this, "Cannot unlock connection lock", e);
+    }
   }
 
   public Set<String> getURLs() {
diff --git a/client/src/main/java/com/orientechnologies/orient/client/remote/ORemoteConnectionPool.java b/client/src/main/java/com/orientechnologies/orient/client/remote/ORemoteConnectionPool.java
@@ -13,7 +13,7 @@
 public class ORemoteConnectionPool
     implements OResourcePoolListener<String, OChannelBinaryAsynchClient> {
 
-  private OResourcePool<String, OChannelBinaryAsynchClient> pool;
+  private final OResourcePool<String, OChannelBinaryAsynchClient> pool;
 
   public ORemoteConnectionPool(int iMaxResources) {
     pool = new OResourcePool<>(iMaxResources, this);
diff --git a/client/src/main/java/com/orientechnologies/orient/client/remote/OStorageRemote.java b/client/src/main/java/com/orientechnologies/orient/client/remote/OStorageRemote.java
@@ -2349,10 +2349,7 @@ public void onPushReconnect(String host) {
   }
 
   public void onPushDisconnect(OChannelBinary network, Exception e) {
-    if (this.connectionManager.getPool(((OChannelBinaryAsynchClient) network).getServerURL())
-        != null) {
-      this.connectionManager.remove((OChannelBinaryAsynchClient) network);
-    }
+    this.connectionManager.removeIfPresent((OChannelBinaryAsynchClient) network);
     if (e instanceof InterruptedException) {
       for (OLiveQueryClientListener liveListener : liveQueryListener.values()) {
         liveListener.onEnd();
