Skip to content

Commit f05ae55

Browse files
author
Zhen Li
committed
Fix after code review
1 parent 1868085 commit f05ae55

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

Neo4j.Driver/Neo4j.Driver/Internal/ConnectionPool.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ private Task<IConnection> AcquireAsync()
229229
IPooledConnection connection = null;
230230
if (!_availableConnections.TryTake(out connection))
231231
{
232+
// TODO: make this timer a cancellationToken instead
232233
Stopwatch connAcquisitionTimer = new Stopwatch();
233234
connAcquisitionTimer.Start();
234235
do
@@ -245,6 +246,11 @@ private Task<IConnection> AcquireAsync()
245246
}
246247
} while (connAcquisitionTimer.ElapsedMilliseconds < _connAcquisitionTimeout.TotalMilliseconds);
247248
connAcquisitionTimer.Stop();
249+
250+
if (connection == null)
251+
{
252+
throw new ClientException($"Failed to obtain a connection from pool within {_connAcquisitionTimeout}");
253+
}
248254
}
249255

250256
if (!connection.IsOpen || HasBeenIdleForTooLong(connection))

Neo4j.Driver/Neo4j.Driver/Internal/ConnectionPoolSettings.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ internal ConnectionPoolSettings(int maxIdleConnectionPoolSize, int maxConnection
4040
TimeSpan connectionAcquisitionTimeout, TimeSpan connectionIdleTimeout,
4141
IStatisticsCollector statisticsCollector=null)
4242
{
43-
Throw.ArgumentNullException.IfNull(maxIdleConnectionPoolSize, nameof(maxIdleConnectionPoolSize));
44-
Throw.ArgumentNullException.IfNull(maxConnectionPoolSize, nameof(maxConnectionPoolSize));
45-
Throw.ArgumentNullException.IfNull(connectionAcquisitionTimeout, nameof(connectionAcquisitionTimeout));
46-
Throw.ArgumentNullException.IfNull(connectionIdleTimeout, nameof(connectionIdleTimeout));
4743
MaxIdleConnectionPoolSize = maxIdleConnectionPoolSize;
4844
MaxConnectionPoolSize = maxConnectionPoolSize;
4945
ConnectionAcquisitionTimeout = connectionAcquisitionTimeout;

Neo4j.Driver/Neo4j.Driver/Internal/ConnectionSettings.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ private ConnectionSettings(Uri initialServerUri, IAuthToken authToken,
4545
IfNull(initialServerUri, nameof(initialServerUri));
4646
IfNull(authToken, nameof(authToken));
4747
IfNull(encryptionManager, nameof(encryptionManager));
48-
IfNull(connectionTimeout, nameof(connectionTimeout));
49-
IfNull(socketKeepAlive, nameof(socketKeepAlive));
50-
IfNull(ipv6Enabled, nameof(ipv6Enabled));
5148

5249
InitialServerUri = initialServerUri;
5350
AuthToken = authToken;

Neo4j.Driver/Neo4j.Driver/V1/GraphDatabase.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@
1515
// See the License for the specific language governing permissions and
1616
// limitations under the License.
1717
using System;
18-
using System.Collections.Generic;
1918
using Neo4j.Driver.Internal;
2019
using Neo4j.Driver.Internal.Routing;
21-
using static Neo4j.Driver.Internal.ExponentialBackoffRetryLogic;
2220

2321
namespace Neo4j.Driver.V1
2422
{

0 commit comments

Comments
 (0)