Return-Path: X-Original-To: apmail-logging-commits-archive@minotaur.apache.org Delivered-To: apmail-logging-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CFF86DDD8 for ; Sun, 4 Nov 2012 15:45:33 +0000 (UTC) Received: (qmail 29172 invoked by uid 500); 4 Nov 2012 15:45:33 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 29126 invoked by uid 500); 4 Nov 2012 15:45:32 -0000 Mailing-List: contact commits-help@logging.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@logging.apache.org Delivered-To: mailing list commits@logging.apache.org Received: (qmail 29110 invoked by uid 99); 4 Nov 2012 15:45:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Nov 2012 15:45:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Nov 2012 15:45:30 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 481B7238890D; Sun, 4 Nov 2012 15:45:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1405570 - in /logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message: MapMessage.java StructuredDataMessage.java Date: Sun, 04 Nov 2012 15:45:10 -0000 To: commits@logging.apache.org From: ggregory@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121104154510.481B7238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ggregory Date: Sun Nov 4 15:45:09 2012 New Revision: 1405570 URL: http://svn.apache.org/viewvc?rev=1405570&view=rev Log: Avoid problems on the Turkish Locale. Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MapMessage.java logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MapMessage.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MapMessage.java?rev=1405570&r1=1405569&r2=1405570&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MapMessage.java (original) +++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MapMessage.java Sun Nov 4 15:45:09 2012 @@ -18,6 +18,7 @@ package org.apache.logging.log4j.message import java.io.Serializable; import java.util.Collections; +import java.util.Locale; import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; @@ -152,7 +153,7 @@ public class MapMessage implements Multi public String asString(String format) { try { - return asString(MapFormat.valueOf(format.toUpperCase())); + return asString(MapFormat.valueOf(format.toUpperCase(Locale.ENGLISH))); } catch (IllegalArgumentException ex) { return asString(); } Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java?rev=1405570&r1=1405569&r2=1405570&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java (original) +++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java Sun Nov 4 15:45:09 2012 @@ -17,6 +17,7 @@ package org.apache.logging.log4j.message; import java.io.Serializable; +import java.util.Locale; import java.util.Map; /** @@ -212,7 +213,7 @@ public class StructuredDataMessage exten @Override public String asString(String format) { try { - return asString(Format.valueOf(format.toUpperCase()), null); + return asString(Format.valueOf(format.toUpperCase(Locale.ENGLISH)), null); } catch (IllegalArgumentException ex) { return asString(); }