fix: minor fix on retrying next host from client

orientechnologies · Jan 15, 2024 · e624889 · e624889
1 parent b66e3cf
commit e624889
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/...nt/src/main/java/com/orientechnologies/orient/client/remote/ORemoteConnectionManager.java b/...nt/src/main/java/com/orientechnologies/orient/client/remote/ORemoteConnectionManager.java
@@ -187,6 +187,9 @@ public int getAvailableConnections(final String url) {
   }
 
   public int getReusableConnections(final String url) {
+    if (url == null) {
+      return 0;
+    }
     final ORemoteConnectionPool pool = connections.get(url);
     if (pool == null) return 0;
 

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
@@ -1900,7 +1900,9 @@ protected void openRemoteDatabase(String currentURL) {
         }
       } while (connectionManager.getReusableConnections(currentURL) > 0);
 
-      currentURL = useNewServerURL(currentURL);
+      if (currentURL != null) {
+        currentURL = useNewServerURL(currentURL);
+      }
 
     } while (currentURL != null);