fix: wrong client returned to the client pool

apache · Aug 27, 2024 · d7d412c · d7d412c
1 parent 2f8a278
commit d7d412c
Showing 1 changed file with 14 additions and 16 deletions.
diff --git a/src/Apache.IoTDB/SessionPool.cs b/src/Apache.IoTDB/SessionPool.cs
@@ -113,20 +113,6 @@ public SessionPool(List<string> nodeUrls, string username, string password, int
         public async Task<TResult> ExecuteClientOperationAsync<TResult>(AsyncOperation<TResult> operation, string errMsg, bool retryOnFailure = true)
         {
             Client client = _clients.Take();
-            Func<Client, Task<TResult>> executeWithReconnect = async (currentClient) =>
-            {
-                try
-                {
-                    currentClient = await Reconnect(currentClient);
-                    var response = await operation(currentClient);
-                    return response;
-                }
-                catch (TException retryEx)
-                {
-                    throw new TException(errMsg, retryEx);
-                }
-            };
-
             try
             {
                 var resp = await operation(client);
@@ -136,7 +122,13 @@ public async Task<TResult> ExecuteClientOperationAsync<TResult>(AsyncOperation<T
             {
                 if (retryOnFailure)
                 {
-                    return await executeWithReconnect(client);
+                    try{
+                        client = await Reconnect(client);
+                        return await operation(client);
+                    } catch (TException retryEx)
+                    {
+                        throw new TException(errMsg, retryEx);
+                    }
                 }
                 else
                 {
@@ -147,7 +139,13 @@ public async Task<TResult> ExecuteClientOperationAsync<TResult>(AsyncOperation<T
             {
                 if (retryOnFailure)
                 {
-                    return await executeWithReconnect(client);
+                    try{
+                        client = await Reconnect(client);
+                        return await operation(client);
+                    } catch (TException retryEx)
+                    {
+                        throw new TException(errMsg, retryEx);
+                    }
                 }
                 else
                 {