Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D3281200C0A for ; Sat, 28 Jan 2017 11:35:02 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id D1C82160B51; Sat, 28 Jan 2017 10:35:02 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2879A160B35 for ; Sat, 28 Jan 2017 11:35:02 +0100 (CET) Received: (qmail 60832 invoked by uid 500); 28 Jan 2017 10:35:01 -0000 Mailing-List: contact commits-help@hc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "HttpComponents Project" Delivered-To: mailing list commits@hc.apache.org Received: (qmail 60823 invoked by uid 99); 28 Jan 2017 10:35:01 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 28 Jan 2017 10:35:01 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id E552F3A05B5 for ; Sat, 28 Jan 2017 10:35:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1780654 - /httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/pool/StrictConnPool.java Date: Sat, 28 Jan 2017 10:35:00 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170128103500.E552F3A05B5@svn01-us-west.apache.org> archived-at: Sat, 28 Jan 2017 10:35:03 -0000 Author: olegk Date: Sat Jan 28 10:35:00 2017 New Revision: 1780654 URL: http://svn.apache.org/viewvc?rev=1780654&view=rev Log: HTTPASYNC-116: Remove cancelled lease requests from the request queue when validating pending requests Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/pool/StrictConnPool.java Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/pool/StrictConnPool.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/pool/StrictConnPool.java?rev=1780654&r1=1780653&r2=1780654&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/pool/StrictConnPool.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/pool/StrictConnPool.java Sat Jan 28 10:35:00 2017 @@ -372,11 +372,18 @@ public class StrictConnPool> it = this.leasingRequests.listIterator(); while (it.hasNext()) { final LeaseRequest request = it.next(); - final long deadline = request.getDeadline(); - if (now > deadline) { + final BasicFuture> future = request.getFuture(); + if (future.isCancelled() && !request.isDone()) { it.remove(); - request.failed(new TimeoutException()); - this.completedRequests.add(request); + } else { + final long deadline = request.getDeadline(); + if (now > deadline) { + request.failed(new TimeoutException()); + } + if (request.isDone()) { + it.remove(); + this.completedRequests.add(request); + } } } } finally {