Skip to content

Commit 0a14aa0

Browse files
committed
Fix timeout wraparound
1 parent c4fa17c commit 0a14aa0

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/pool/SqlConnectionPool.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ public SqlConnectionPool(Function<Context, Future<SqlConnection>> connectionProv
7474
this.pool = ConnectionPool.pool(connector, new int[]{maxSize}, maxWaitQueueSize);
7575
this.vertx = vertx;
7676
this.pipeliningLimit = pipeliningLimit;
77-
this.idleTimeout = idleTimeout > 0 ? idleTimeout : Long.MAX_VALUE;
78-
this.maxLifetime = maxLifetime > 0 ? maxLifetime : Long.MAX_VALUE;
77+
this.idleTimeout = idleTimeout;
78+
this.maxLifetime = maxLifetime;
7979
this.maxSize = maxSize;
8080
this.hook = hook;
8181
this.connectionProvider = connectionProvider;
@@ -271,7 +271,7 @@ public class PooledConnection implements Connection, Connection.Holder {
271271
this.factory = factory;
272272
this.conn = conn;
273273
this.listener = listener;
274-
this.lifetimeEvictionTimestamp = System.currentTimeMillis() + maxLifetime;
274+
this.lifetimeEvictionTimestamp = maxLifetime > 0 ? System.currentTimeMillis() + maxLifetime : Long.MAX_VALUE;
275275
refresh();
276276
}
277277

@@ -312,7 +312,7 @@ private void close(Promise<Void> promise) {
312312
}
313313

314314
public void refresh() {
315-
this.idleEvictionTimestamp = System.currentTimeMillis() + idleTimeout;
315+
this.idleEvictionTimestamp = idleTimeout > 0 ? System.currentTimeMillis() + idleTimeout : Long.MAX_VALUE;
316316
}
317317

318318
@Override

0 commit comments

Comments
 (0)