HTTPCLIENT-2298: Strict connection pool to filter out expired and com…

…pleted requests from the pool stats
apache · Sep 25, 2023 · 371347a · 371347a
1 parent e3c770b
commit 371347a
Showing 1 changed file with 15 additions and 3 deletions.
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
@@ -518,9 +518,18 @@ public int getMaxPerRoute(final T route) {
     public PoolStats getTotalStats() {
         this.lock.lock();
         try {
+            int pendingCount = 0;
+            for (final LeaseRequest<T, C> request: pendingRequests) {
+                if (!request.isDone()) {
+                    final Deadline deadline = request.getDeadline();
+                    if (!deadline.isExpired()) {
+                        pendingCount++;
+                    }
+                }
+            }
             return new PoolStats(
                     this.leased.size(),
-                    this.pendingRequests.size(),
+                    pendingCount,
                     this.available.size(),
                     this.maxTotal);
         } finally {
@@ -536,8 +545,11 @@ public PoolStats getStats(final T route) {
             final PerRoutePool<T, C> pool = getPool(route);
             int pendingCount = 0;
             for (final LeaseRequest<T, C> request: pendingRequests) {
-                if (Objects.equals(route, request.getRoute())) {
-                    pendingCount++;
+                if (!request.isDone() && Objects.equals(route, request.getRoute())) {
+                    final Deadline deadline = request.getDeadline();
+                    if (!deadline.isExpired()) {
+                        pendingCount++;
+                    }
                 }
             }
             return new PoolStats(