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 32291200D21 for ; Mon, 16 Oct 2017 14:53:50 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 30F39160BEC; Mon, 16 Oct 2017 12:53:50 +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 7C9DF160BE9 for ; Mon, 16 Oct 2017 14:53:49 +0200 (CEST) Received: (qmail 78818 invoked by uid 500); 16 Oct 2017 12:53:48 -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 78719 invoked by uid 99); 16 Oct 2017 12:53:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Oct 2017 12:53:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D385BDFC8B; Mon, 16 Oct 2017 12:53:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: olegk@apache.org To: commits@hc.apache.org Date: Mon, 16 Oct 2017 12:53:50 -0000 Message-Id: In-Reply-To: <02a2b107b7fa4408a5b95c58e1e8a336@git.apache.org> References: <02a2b107b7fa4408a5b95c58e1e8a336@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/6] httpcomponents-client git commit: Fixed NPE in case of a missing Max-Forwards header archived-at: Mon, 16 Oct 2017 12:53:50 -0000 Fixed NPE in case of a missing Max-Forwards header Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/repo Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/commit/25d33819 Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/tree/25d33819 Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/diff/25d33819 Branch: refs/heads/master Commit: 25d3381904e1427983cc1f87e8b7e6e1cc18bbfd Parents: 38a9276 Author: Oleg Kalnichevski Authored: Sun Oct 15 13:31:13 2017 +0200 Committer: Oleg Kalnichevski Committed: Mon Oct 16 14:34:52 2017 +0200 ---------------------------------------------------------------------- .../org/apache/hc/client5/http/impl/cache/CachingExecBase.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/25d33819/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExecBase.java ---------------------------------------------------------------------- diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExecBase.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExecBase.java index 5117eb8..1ab84d6 100644 --- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExecBase.java +++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExecBase.java @@ -354,7 +354,8 @@ public class CachingExecBase { return false; } - if (!"0".equals(request.getFirstHeader(HeaderConstants.MAX_FORWARDS).getValue())) { + final Header h = request.getFirstHeader(HeaderConstants.MAX_FORWARDS); + if (!"0".equals(h != null ? h.getValue() : null)) { return false; }