Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 97DAE19D18 for ; Thu, 14 Apr 2016 15:19:43 +0000 (UTC) Received: (qmail 55308 invoked by uid 500); 14 Apr 2016 15:19:43 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 55248 invoked by uid 500); 14 Apr 2016 15:19:43 -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 55239 invoked by uid 99); 14 Apr 2016 15:19:43 -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; Thu, 14 Apr 2016 15:19:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 59211DFE61; Thu, 14 Apr 2016 15:19:43 +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: <38bfe2948fc64445bb2b8cde489ab59c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Fixing 3.1.x compilation failure Date: Thu, 14 Apr 2016 15:19:43 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 11f3e36e1 -> e5a5d5b64 Fixing 3.1.x compilation failure Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e5a5d5b6 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e5a5d5b6 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e5a5d5b6 Branch: refs/heads/3.1.x-fixes Commit: e5a5d5b64015faffa3479ac009631c66f9f56036 Parents: 11f3e36 Author: Sergey Beryozkin Authored: Thu Apr 14 16:19:21 2016 +0100 Committer: Sergey Beryozkin Committed: Thu Apr 14 16:19:21 2016 +0100 ---------------------------------------------------------------------- .../org/apache/cxf/jaxrs/provider/ProviderCache.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/e5a5d5b6/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java index 37aeb7b..15fdd03 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java @@ -51,7 +51,11 @@ public class ProviderCache { String key = getKey(type, mt); List>> list = readerProviderCache.get(key); - return list != null ? list : Collections.emptyList(); + if (list != null) { + return list; + } else { + return Collections.emptyList(); + } } public List>> getWriters(Class type, MediaType mt) { if (writerProviderCache.isEmpty()) { @@ -61,7 +65,11 @@ public class ProviderCache { String key = getKey(type, mt); List>> list = writerProviderCache.get(key); - return list != null ? list : Collections.emptyList(); + if (list != null) { + return list; + } else { + return Collections.emptyList(); + } } public void putReaders(Class type, MediaType mt, List>> candidates) {