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 B2761200BA5 for ; Wed, 19 Oct 2016 12:13:10 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B1067160AEA; Wed, 19 Oct 2016 10:13:10 +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 0556C160ADE for ; Wed, 19 Oct 2016 12:13:09 +0200 (CEST) Received: (qmail 63950 invoked by uid 500); 19 Oct 2016 10:13:09 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 63941 invoked by uid 99); 19 Oct 2016 10:13:09 -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; Wed, 19 Oct 2016 10:13:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EC60BDFCF2; Wed, 19 Oct 2016 10:13:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: <55a7aadbf61f4b479a39e104bab38d5c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: [CXF-7075] Fixing NPE Date: Wed, 19 Oct 2016 10:13:08 +0000 (UTC) archived-at: Wed, 19 Oct 2016 10:13:10 -0000 Repository: cxf Updated Branches: refs/heads/3.1.x-fixes e629ea636 -> a05c7c9b7 [CXF-7075] Fixing NPE Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a05c7c9b Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a05c7c9b Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a05c7c9b Branch: refs/heads/3.1.x-fixes Commit: a05c7c9b79186724301f34efb8636f9cdcaa886e Parents: e629ea6 Author: Sergey Beryozkin Authored: Wed Oct 19 11:11:36 2016 +0100 Committer: Sergey Beryozkin Committed: Wed Oct 19 11:12:23 2016 +0100 ---------------------------------------------------------------------- .../org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/a05c7c9b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java index 1790d36..eb1758a 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java @@ -72,7 +72,10 @@ public class HttpServletRequestFilter extends HttpServletRequestWrapper { String[] value = super.getParameterValues(name); if (value == null && isPostFormRequest) { readFromParamsIfNeeded(); - value = formParams.get(name).toArray(new String[]{}); + List values = formParams.get(name); + if (values != null) { + value = values.toArray(new String[]{}); + } } return value; }