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 B33F6200C0C for ; Mon, 30 Jan 2017 11:13:16 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id B1C31160B4D; Mon, 30 Jan 2017 10:13:16 +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 04931160B41 for ; Mon, 30 Jan 2017 11:13:15 +0100 (CET) Received: (qmail 59132 invoked by uid 500); 30 Jan 2017 10:13:15 -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 59123 invoked by uid 99); 30 Jan 2017 10:13:15 -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, 30 Jan 2017 10:13:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0D462DFC9D; Mon, 30 Jan 2017 10:13:15 +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: <2b6ceac0c25c412dbcdad7eb853d5a7b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: CXF-7236: Fix ArrayIndexOutOfBound when Accept header is not set, patch from Jeremy Kuhn applied, This closes #230 Date: Mon, 30 Jan 2017 10:13:15 +0000 (UTC) archived-at: Mon, 30 Jan 2017 10:13:16 -0000 Repository: cxf Updated Branches: refs/heads/3.1.x-fixes aa57ecfb9 -> f8ee91929 CXF-7236: Fix ArrayIndexOutOfBound when Accept header is not set, patch from Jeremy Kuhn applied, This closes #230 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f8ee9192 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f8ee9192 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f8ee9192 Branch: refs/heads/3.1.x-fixes Commit: f8ee9192936110ae2daa419a52ac3818f46e00ca Parents: aa57ecf Author: Sergey Beryozkin Authored: Mon Jan 30 10:10:04 2017 +0000 Committer: Sergey Beryozkin Committed: Mon Jan 30 10:11:37 2017 +0000 ---------------------------------------------------------------------- .../src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java | 2 +- .../java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/f8ee9192/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java index 3990af4..79c4d4a 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java @@ -315,7 +315,7 @@ public class HttpHeadersImpl implements HttpHeaders { public Date getDate() { List values = headers.get(HttpHeaders.DATE); - if (values == null || StringUtils.isEmpty(values.get(0))) { + if (values == null || values.isEmpty() || StringUtils.isEmpty(values.get(0))) { return null; } return HttpUtils.getHttpDate(values.get(0)); http://git-wip-us.apache.org/repos/asf/cxf/blob/f8ee9192/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java index e685d30..6b70283 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java @@ -133,7 +133,7 @@ public class JAXRSInInterceptor extends AbstractPhaseInterceptor { // Accept String acceptTypes = null; List acceptHeaderValues = protocolHeaders.get(Message.ACCEPT_CONTENT_TYPE); - if (acceptHeaderValues != null) { + if (acceptHeaderValues != null && !acceptHeaderValues.isEmpty()) { acceptTypes = acceptHeaderValues.get(0); message.put(Message.ACCEPT_CONTENT_TYPE, acceptTypes); }