Check for timeToLive == 0

ChristophKaser · ok2c · commit 223669659c29 · 2023-07-22T13:04:18.000+02:00
Allows setting connection timeToLive and validateAfterInactivity to zero to always close or validate a connection
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java
@@ -322,17 +322,17 @@ public synchronized ConnectionEndpoint get(
                     if (poolEntry.hasConnection()) {
                         final TimeValue timeToLive = connectionConfig.getTimeToLive();
                         if (TimeValue.isNonNegative(timeToLive)) {
-                            final Deadline deadline = Deadline.calculate(poolEntry.getCreated(), timeToLive);
-                            if (deadline.isExpired()) {
+                            if (timeToLive.getDuration() == 0
+                                    || Deadline.calculate(poolEntry.getCreated(), timeToLive).isExpired()) {
                                 poolEntry.discardConnection(CloseMode.GRACEFUL);
                             }
                         }
                     }
                     if (poolEntry.hasConnection()) {
                         final TimeValue timeValue = resolveValidateAfterInactivity(connectionConfig);
                         if (TimeValue.isNonNegative(timeValue)) {
-                            final Deadline deadline = Deadline.calculate(poolEntry.getUpdated(), timeValue);
-                            if (deadline.isExpired()) {
+                            if (timeValue.getDuration() == 0
+                                    || Deadline.calculate(poolEntry.getUpdated(), timeValue).isExpired()) {
                                 final ManagedHttpClientConnection conn = poolEntry.getConnection();
                                 boolean stale;
                                 try {
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManager.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManager.java
@@ -278,8 +278,8 @@ public void completed(final PoolEntry<HttpRoute, ManagedAsyncClientConnection> p
                             if (poolEntry.hasConnection()) {
                                 final TimeValue timeToLive = connectionConfig.getTimeToLive();
                                 if (TimeValue.isNonNegative(timeToLive)) {
-                                    final Deadline deadline = Deadline.calculate(poolEntry.getCreated(), timeToLive);
-                                    if (deadline.isExpired()) {
+                                    if (timeToLive.getDuration() == 0
+                                            || Deadline.calculate(poolEntry.getCreated(), timeToLive).isExpired()) {
                                         poolEntry.discardConnection(CloseMode.GRACEFUL);
                                     }
                                 }
@@ -288,8 +288,8 @@ public void completed(final PoolEntry<HttpRoute, ManagedAsyncClientConnection> p
                                 final ManagedAsyncClientConnection connection = poolEntry.getConnection();
                                 final TimeValue timeValue = connectionConfig.getValidateAfterInactivity();
                                 if (connection.isOpen() && TimeValue.isNonNegative(timeValue)) {
-                                    final Deadline deadline = Deadline.calculate(poolEntry.getUpdated(), timeValue);
-                                    if (deadline.isExpired()) {
+                                    if (timeValue.getDuration() == 0
+                                            || Deadline.calculate(poolEntry.getUpdated(), timeValue).isExpired()) {
                                         final ProtocolVersion protocolVersion = connection.getProtocolVersion();
                                         if (protocolVersion != null && protocolVersion.greaterEquals(HttpVersion.HTTP_2_0)) {
                                             connection.submitCommand(new PingCommand(new BasicPingHandler(result -> {
