Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/SapNwRfc/Pooling/SapConnectionPool.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ namespace SapNwRfc.Pooling
/// </summary>
public sealed class SapConnectionPool : ISapConnectionPool
{
public const int DefaultPoolSize = 5;
private readonly SapConnectionParameters _connectionParameters;
private readonly int _poolSize;
private readonly Func<SapConnectionParameters, ISapConnection> _connectionFactory;
Expand All @@ -30,7 +31,7 @@ public sealed class SapConnectionPool : ISapConnectionPool
[SuppressMessage("ReSharper", "RedundantOverload.Global", Justification = "Public constructor should not expose connection factory")]
public SapConnectionPool(
string connectionString,
int poolSize = 5,
int poolSize = DefaultPoolSize,
TimeSpan? connectionIdleTimeout = null,
TimeSpan? idleDetectionInterval = null)
: this(SapConnectionParameters.Parse(connectionString), poolSize, connectionIdleTimeout, idleDetectionInterval, null)
Expand All @@ -47,7 +48,7 @@ public SapConnectionPool(
[ExcludeFromCodeCoverage]
public SapConnectionPool(
SapConnectionParameters connectionParameters,
int poolSize = 5,
int poolSize = DefaultPoolSize,
TimeSpan? connectionIdleTimeout = null,
TimeSpan? idleDetectionInterval = null)
: this(connectionParameters, poolSize, connectionIdleTimeout, idleDetectionInterval, null)
Expand All @@ -56,13 +57,15 @@ public SapConnectionPool(

internal SapConnectionPool(
SapConnectionParameters connectionParameters,
int poolSize = 5,
int poolSize = DefaultPoolSize,
TimeSpan? connectionIdleTimeout = null,
TimeSpan? idleDetectionInterval = null,
Func<SapConnectionParameters, ISapConnection> connectionFactory = null)
{
_connectionParameters = connectionParameters;
_poolSize = poolSize;
/* fallback to connection string if pool size not specified*/
var poolSizeFromConnectionString = int.TryParse(_connectionParameters.PoolSize ?? _connectionParameters.MaxPoolSize ?? "0", out int parsedPoolSize) ? parsedPoolSize : 0;
_poolSize = poolSize != DefaultPoolSize && poolSizeFromConnectionString == 0 ? poolSize : poolSizeFromConnectionString;
_connectionIdleTimeout = connectionIdleTimeout ?? TimeSpan.FromSeconds(30);
_connectionFactory = connectionFactory ?? (parameters => new SapConnection(parameters));
_leases = new SemaphoreSlim(poolSize, poolSize);
Expand Down