Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 83423 invoked from network); 25 Jun 2007 21:38:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 Jun 2007 21:38:20 -0000 Received: (qmail 63852 invoked by uid 500); 25 Jun 2007 21:38:23 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 63752 invoked by uid 500); 25 Jun 2007 21:38:23 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 63741 invoked by uid 500); 25 Jun 2007 21:38:23 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 63738 invoked by uid 99); 25 Jun 2007 21:38:23 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Jun 2007 14:38:23 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Jun 2007 14:38:19 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 40D9E1A981A; Mon, 25 Jun 2007 14:37:59 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r550616 - /webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/util/XMLFaultUtils.java Date: Mon, 25 Jun 2007 21:37:59 -0000 To: axis2-cvs@ws.apache.org From: rott@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070625213759.40D9E1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rott Date: Mon Jun 25 14:37:58 2007 New Revision: 550616 URL: http://svn.apache.org/viewvc?view=rev&rev=550616 Log: XMLFaultUtils setting fault reason locale incorrectly according to soap spec Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/util/XMLFaultUtils.java Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/util/XMLFaultUtils.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/util/XMLFaultUtils.java?view=diff&rev=550616&r1=550615&r2=550616 ============================================================================== --- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/util/XMLFaultUtils.java (original) +++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/util/XMLFaultUtils.java Mon Jun 25 14:37:58 2007 @@ -260,8 +260,7 @@ // TODO what if this fails String text = soapFault.getFaultString(); Locale locale = soapFault.getFaultStringLocale(); - String lang = (locale == null) ? Locale.getDefault().getLanguage() : locale.getLanguage(); - XMLFaultReason reason = new XMLFaultReason(text, lang); + XMLFaultReason reason = new XMLFaultReason(text, localeToXmlLang(locale)); // Construct the XMLFault from the required information (code, reason, detail blocks) XMLFault xmlFault = new XMLFault(code, reason, detailBlocks); @@ -299,8 +298,7 @@ first = false; } else { text = soapFault.getFaultReasonText(locale); - lang = locale.getLanguage(); - list.add(new XMLFaultReason(text, lang)); + list.add(new XMLFaultReason(text, localeToXmlLang(locale))); } } if (list.size() > 0) { @@ -635,5 +633,24 @@ return soapFault; + } + + /** + * Converte a Locale object to an xmlLang String + * @param locale + * @return String of the form - + */ + private static String localeToXmlLang(Locale locale) { + if (locale == null) { + return Locale.getDefault().getLanguage() + "-" + Locale.getDefault().getCountry(); + } + String lang = locale.getLanguage(); + String countryCode = locale.getCountry(); + if (countryCode == null || countryCode.length() == 0) { + return lang; + } else { + return new String(lang + "-" + countryCode); + } + } } --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org