Fix SapConnectionPool when connection.Connect() throws

campersau · May 13, 2022 · 0d4351b · 0d4351b
1 parent b5c6605
commit 0d4351b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/SapNwRfc/Pooling/SapConnectionPool.cs b/src/SapNwRfc/Pooling/SapConnectionPool.cs
@@ -114,7 +114,16 @@ public ISapConnection GetConnection(CancellationToken cancellationToken = defaul
 
                     if (connection != null)
                     {
-                        connection.Connect();
+                        try
+                        {
+                            connection.Connect();
+                        }
+                        catch
+                        {
+                            lock (_syncRoot) _openConnectionCount--;
+                            throw;
+                        }
+
                         return connection;
                     }
                 }

diff --git a/src/SapNwRfc/Pooling/SapPooledConnection.cs b/src/SapNwRfc/Pooling/SapPooledConnection.cs
@@ -73,9 +73,10 @@ public void InvokeFunction(string name, CancellationToken cancellationToken = de
         /// <inheritdoc cref="ISapPooledConnection"/>
         public void InvokeFunction(string name, object input, CancellationToken cancellationToken = default)
         {
+            _connection = _connection ?? _pool.GetConnection(cancellationToken);
+
             try
             {
-                _connection = _connection ?? _pool.GetConnection(cancellationToken);
                 using (ISapFunction function = _connection.CreateFunction(name))
                     function.Invoke(input);
             }
@@ -94,9 +95,10 @@ public void InvokeFunction(string name, object input, CancellationToken cancella
         /// <inheritdoc cref="ISapPooledConnection"/>
         public TOutput InvokeFunction<TOutput>(string name, CancellationToken cancellationToken = default)
         {
+            _connection = _connection ?? _pool.GetConnection(cancellationToken);
+
             try
             {
-                _connection = _connection ?? _pool.GetConnection(cancellationToken);
                 using (ISapFunction function = _connection.CreateFunction(name))
                     return function.Invoke<TOutput>();
             }
@@ -115,9 +117,10 @@ public TOutput InvokeFunction<TOutput>(string name, CancellationToken cancellati
         /// <inheritdoc cref="ISapPooledConnection"/>
         public TOutput InvokeFunction<TOutput>(string name, object input, CancellationToken cancellationToken = default)
         {
+            _connection = _connection ?? _pool.GetConnection(cancellationToken);
+
             try
             {
-                _connection = _connection ?? _pool.GetConnection(cancellationToken);
                 using (ISapFunction function = _connection.CreateFunction(name))
                     return function.Invoke<TOutput>(input);
             }