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 0C4FC10906 for ; Tue, 29 Apr 2014 12:21:24 +0000 (UTC) Received: (qmail 2970 invoked by uid 500); 29 Apr 2014 12:21:22 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 2857 invoked by uid 500); 29 Apr 2014 12:21:21 -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 2850 invoked by uid 99); 29 Apr 2014 12:21:20 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Apr 2014 12:21:20 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B5E80995301; Tue, 29 Apr 2014 12:21:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ay@apache.org To: commits@cxf.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: CXF-5711's version 3.0.0 specific simplified fix Date: Tue, 29 Apr 2014 12:21:18 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/master b4436e582 -> 9c68cd239 CXF-5711's version 3.0.0 specific simplified fix Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9c68cd23 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9c68cd23 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9c68cd23 Branch: refs/heads/master Commit: 9c68cd2391f9bfa70727268514dca95dd0100ad3 Parents: b4436e5 Author: Akitoshi Yoshida Authored: Tue Apr 29 14:19:58 2014 +0200 Committer: Akitoshi Yoshida Committed: Tue Apr 29 14:21:14 2014 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/9c68cd23/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java index 8a92c28..3b97d5d 100644 --- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java +++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java @@ -27,7 +27,6 @@ import java.net.HttpURLConnection; import java.util.Locale; import java.util.Map; import java.util.concurrent.Future; -import java.util.logging.Level; import java.util.logging.Logger; import javax.xml.namespace.QName; @@ -259,14 +258,7 @@ public class JaxWsClientProxy extends org.apache.cxf.frontend.ClientProxy implem private static Locale stringToLocale(String locale) { // use the IETF BCP 47 delimiter but accept the toString delimiter for cxf 2.7.x - final String ch; - if (locale.indexOf('_') > 0) { - LOG.log(Level.WARNING, "invalid IETF BCP 47 language tag: {0}", locale); - ch = "_"; - } else { - ch = "-"; - } - String parts[] = locale.split(ch, 0); + String parts[] = locale.split("-", 0); if (parts.length == 1) { return new Locale(parts[0]); } else if (parts.length == 2) {