You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2015/06/10 18:57:16 UTC
logging-log4j2 git commit: Clean up Turkish level name solution.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 9d8757e4f -> 6e84e75ec
Clean up Turkish level name solution.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6e84e75e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6e84e75e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6e84e75e
Branch: refs/heads/master
Commit: 6e84e75eca898b72d3ca80e9efd46c2262de2cc2
Parents: 9d8757e
Author: Gary Gregory <ga...@gmail.com>
Authored: Wed Jun 10 09:57:14 2015 -0700
Committer: Gary Gregory <ga...@gmail.com>
Committed: Wed Jun 10 09:57:14 2015 -0700
----------------------------------------------------------------------
log4j-1.2-api/src/main/java/org/apache/log4j/Level.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6e84e75e/log4j-1.2-api/src/main/java/org/apache/log4j/Level.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/Level.java b/log4j-1.2-api/src/main/java/org/apache/log4j/Level.java
index 8eecb8f..af53154 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/Level.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/Level.java
@@ -21,6 +21,7 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.ObjectStreamException;
import java.io.Serializable;
+import java.util.Locale;
import org.apache.logging.log4j.util.Strings;
@@ -174,7 +175,7 @@ public class Level extends Priority implements Serializable {
if (sArg == null) {
return defaultLevel;
}
- final String s = sArg.toUpperCase();
+ final String s = sArg.toUpperCase(Locale.ROOT);
switch (s) {
case "ALL":
return Level.ALL;
@@ -192,11 +193,6 @@ public class Level extends Priority implements Serializable {
return Level.OFF;
case "TRACE":
return Level.TRACE;
- case "\u0130NFO":
- //
- // For Turkish i problem, see bug 40937
- //
- return Level.INFO;
default:
return defaultLevel;
}