HTTPCORE-754: StrictConnPool fails to correctly handle infinite reque…

…st timeout
apache · Jul 6, 2023 · aa5bdbb · aa5bdbb
1 parent 243a7e8
commit aa5bdbb
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/pool/StrictConnPool.java b/httpcore5/src/main/java/org/apache/hc/core5/pool/StrictConnPool.java
@@ -192,7 +192,12 @@ public synchronized PoolEntry<T, C> get(
         final boolean acquiredLock;
 
         try {
-            acquiredLock = this.lock.tryLock(requestTimeout.getDuration(), requestTimeout.getTimeUnit());
+            if (Timeout.isPositive(requestTimeout)) {
+                acquiredLock = this.lock.tryLock(requestTimeout.getDuration(), requestTimeout.getTimeUnit());
+            } else {
+                this.lock.lockInterruptibly();
+                acquiredLock = true;
+            }
         } catch (final InterruptedException interruptedException) {
             Thread.currentThread().interrupt();
             future.cancel();