Skip to content
Merged
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
13 changes: 11 additions & 2 deletions driver/src/main/java/org/neo4j/driver/internal/DriverFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,15 @@ private BoltConnectionSourceFactory createPooledBoltConnectionSource(
boltConnectionProviderFactory);
var listeningBoltConnectionProvider = BoltConnectionListener.listeningBoltConnectionProvider(
boltConnectionProvider, boltConnectionListener);
var connectTimeoutMillisAdjusted = connectTimeoutMillis;
var connectionAcquisitionTimeoutMillis = config.connectionAcquisitionTimeoutMillis();
if (connectTimeoutMillisAdjusted == 0 && connectionAcquisitionTimeoutMillis > 0) {
connectTimeoutMillisAdjusted = (int) connectionAcquisitionTimeoutMillis;
if (connectTimeoutMillisAdjusted != connectionAcquisitionTimeoutMillis) {
throw new IllegalStateException(
"Failed to determine connection timeout from acquisition timeout due to overflow, set connection timeout to non zero value");
}
}
return new PooledBoltConnectionSource(
loggingProvider,
clock,
Expand All @@ -374,14 +383,14 @@ private BoltConnectionSourceFactory createPooledBoltConnectionSource(
authTokenManager,
createSecurityPlanSupplierWithHostname(securityPlanSupplier, expectedVerificationHostname),
config.maxConnectionPoolSize(),
config.connectionAcquisitionTimeoutMillis(),
connectionAcquisitionTimeoutMillis,
config.maxConnectionLifetimeMillis(),
config.idleTimeBeforeConnectionTest(),
observationProvider,
routingContextAddress,
boltAgent,
userAgent,
connectTimeoutMillis,
connectTimeoutMillisAdjusted,
notificationConfig,
PooledBoltConnectionSource.TimeoutPolicy.DEFAULT);
};
Expand Down