Return-Path: 
 <commits-return-41322-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
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 348EC19DD7
	for <apmail-cxf-commits-archive@www.apache.org>;
 Wed, 30 Mar 2016 12:14:10 +0000 (UTC)
Received: (qmail 77725 invoked by uid 500); 30 Mar 2016 12:14:10 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 77661 invoked by uid 500); 30 Mar 2016 12:14:09 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 77559 invoked by uid 99); 30 Mar 2016 12:14: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, 30 Mar 2016 12:14:09 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 797E3E04EB; Wed, 30 Mar 2016 12:14:09 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: ema@apache.org
To: commits@cxf.apache.org
Date: Wed, 30 Mar 2016 12:14:10 -0000
Message-Id: <c71381c35d1540f584d22279367106a7@git.apache.org>
In-Reply-To: <767830c4946b4e8eae1f35ece7423739@git.apache.org>
References: <767830c4946b4e8eae1f35ece7423739@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/3] cxf git commit: [CXF-6850]:javax.ws.rs.core.Request
 implementation doesn't match Accept-Encoding: * for any encoding value

[CXF-6850]:javax.ws.rs.core.Request implementation doesn't match Accept-Encoding: * for any encoding value


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f9a36aa8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f9a36aa8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f9a36aa8

Branch: refs/heads/3.1.x-fixes
Commit: f9a36aa808d0908aee41890c2a21c26106cc9ac5
Parents: b133237
Author: Jim Ma <ema@apache.org>
Authored: Wed Mar 30 15:42:13 2016 +0800
Committer: Jim Ma <ema@apache.org>
Committed: Wed Mar 30 20:00:53 2016 +0800

----------------------------------------------------------------------
 .../java/org/apache/cxf/jaxrs/impl/RequestImpl.java   | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/f9a36aa8/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
index a728caf..e5ee091 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
@@ -90,7 +90,7 @@ public class RequestImpl implements Request {
             }
             
             boolean encMatched = acceptEncs.isEmpty() || enc == null 
-                || acceptEncs.contains(enc);
+                || isEncMatached(acceptEncs, enc);;
             if (encMatched) {
                 handleVaryValues(varyValues, HttpHeaders.ACCEPT_ENCODING);
             }
@@ -148,6 +148,18 @@ public class RequestImpl implements Request {
         return false;
     }
 
+    private static boolean isEncMatached(List<String> accepts, String enc) {
+        if (accepts.contains(enc)) {
+            return true;
+        }
+        for (String accept : accepts) {
+            if ("*".equals(accept)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private static List<String> parseAcceptEnc(String acceptEnc) {
         if (StringUtils.isEmpty(acceptEnc)) {
             return Collections.emptyList();