Author: ggregory
Date: Sun Nov 4 15:43:15 2012
New Revision: 1405567
URL: http://svn.apache.org/viewvc?rev=1405567&view=rev
Log:
Avoid problems on the Turkish Locale.
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java?rev=1405567&r1=1405566&r2=1405567&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
Sun Nov 4 15:43:15 2012
@@ -26,6 +26,7 @@ import org.apache.logging.log4j.core.con
import org.apache.logging.log4j.message.Message;
import java.util.Iterator;
+import java.util.Locale;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.DelayQueue;
@@ -223,8 +224,8 @@ public final class BurstFilter extends A
@PluginAttr("maxBurst") String
maxBurst,
@PluginAttr("onmatch") String match,
@PluginAttr("onmismatch") String
mismatch) {
- Result onMatch = match == null ? null :
Result.valueOf(match.toUpperCase());
- Result onMismatch = mismatch == null ? null :
Result.valueOf(mismatch.toUpperCase());
+ Result onMatch = match == null ? null :
Result.valueOf(match.toUpperCase(Locale.ENGLISH));
+ Result onMismatch = mismatch == null ? null :
Result.valueOf(mismatch.toUpperCase(Locale.ENGLISH));
Level lvl = Level.toLevel(level, Level.WARN);
float eventRate = rate == null ? DEFAULT_RATE : Float.parseFloat(rate);
if (eventRate <= 0) {
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java?rev=1405567&r1=1405566&r2=1405567&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
Sun Nov 4 15:43:15 2012
@@ -29,6 +29,7 @@ import org.apache.logging.log4j.core.hel
import org.apache.logging.log4j.message.Message;
import java.util.HashMap;
+import java.util.Locale;
import java.util.Map;
/**
@@ -127,11 +128,11 @@ public final class DynamicThresholdFilte
@PluginAttr("defaultThreshold") String level,
@PluginAttr("onmatch")
String match,
@PluginAttr("onmismatch") String mismatch) {
- Result onMatch = match == null ? null :
Result.valueOf(match.toUpperCase());
- Result onMismatch = mismatch == null ? null :
Result.valueOf(mismatch.toUpperCase());
+ Result onMatch = match == null ? null :
Result.valueOf(match.toUpperCase(Locale.ENGLISH));
+ Result onMismatch = mismatch == null ? null :
Result.valueOf(mismatch.toUpperCase(Locale.ENGLISH));
Map<String, Level> map = new HashMap<String, Level>();
for (KeyValuePair pair : pairs) {
- map.put(pair.getKey(),
Level.toLevel(pair.getValue().toUpperCase()));
+ map.put(pair.getKey(),
Level.toLevel(pair.getValue().toUpperCase(Locale.ENGLISH)));
}
Level l = Level.toLevel(level, Level.ERROR);
return new DynamicThresholdFilter(key, map, l, onMatch, onMismatch);
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java?rev=1405567&r1=1405566&r2=1405567&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
Sun Nov 4 15:43:15 2012
@@ -31,6 +31,7 @@ import org.apache.logging.log4j.message.
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
/**
@@ -148,8 +149,8 @@ public class MapFilter extends AbstractF
return null;
}
boolean isAnd = oper == null || !oper.equalsIgnoreCase("or");
- Result onMatch = match == null ? null :
Result.valueOf(match.toUpperCase());
- Result onMismatch = mismatch == null ? null :
Result.valueOf(mismatch.toUpperCase());
+ Result onMatch = match == null ? null :
Result.valueOf(match.toUpperCase(Locale.ENGLISH));
+ Result onMismatch = mismatch == null ? null :
Result.valueOf(mismatch.toUpperCase(Locale.ENGLISH));
return new MapFilter(map, isAnd, onMatch, onMismatch);
}
}
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java?rev=1405567&r1=1405566&r2=1405567&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java
Sun Nov 4 15:43:15 2012
@@ -16,6 +16,8 @@
*/
package org.apache.logging.log4j.core.filter;
+import java.util.Locale;
+
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.core.LogEvent;
@@ -85,8 +87,8 @@ public final class MarkerFilter extends
LOGGER.error("A marker must be provided for MarkerFilter");
return null;
}
- Result onMatch = match == null ? null :
Result.valueOf(match.toUpperCase());
- Result onMismatch = mismatch == null ? null :
Result.valueOf(mismatch.toUpperCase());
+ Result onMatch = match == null ? null :
Result.valueOf(match.toUpperCase(Locale.ENGLISH));
+ Result onMismatch = mismatch == null ? null :
Result.valueOf(mismatch.toUpperCase(Locale.ENGLISH));
return new MarkerFilter(marker, onMatch, onMismatch);
}
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java?rev=1405567&r1=1405566&r2=1405567&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java
Sun Nov 4 15:43:15 2012
@@ -25,6 +25,7 @@ import org.apache.logging.log4j.core.con
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.message.Message;
+import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -112,8 +113,8 @@ public final class RegexFilter extends A
LOGGER.error("RegexFilter caught exception compiling pattern: " +
regex + " cause: " + ex.getMessage());
return null;
}
- Result onMatch = match == null ? null :
Result.valueOf(match.toUpperCase());
- Result onMismatch = mismatch == null ? null :
Result.valueOf(mismatch.toUpperCase());
+ Result onMatch = match == null ? null :
Result.valueOf(match.toUpperCase(Locale.ENGLISH));
+ Result onMismatch = mismatch == null ? null :
Result.valueOf(mismatch.toUpperCase(Locale.ENGLISH));
return new RegexFilter(raw, pattern, onMatch, onMismatch);
}
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java?rev=1405567&r1=1405566&r2=1405567&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java
Sun Nov 4 15:43:15 2012
@@ -30,6 +30,7 @@ import org.apache.logging.log4j.message.
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
/**
@@ -132,8 +133,8 @@ public final class StructuredDataFilter
return null;
}
boolean isAnd = oper == null || !oper.equalsIgnoreCase("or");
- Result onMatch = match == null ? null :
Result.valueOf(match.toUpperCase());
- Result onMismatch = mismatch == null ? null :
Result.valueOf(mismatch.toUpperCase());
+ Result onMatch = match == null ? null :
Result.valueOf(match.toUpperCase(Locale.ENGLISH));
+ Result onMismatch = mismatch == null ? null :
Result.valueOf(mismatch.toUpperCase(Locale.ENGLISH));
return new StructuredDataFilter(map, isAnd, onMatch, onMismatch);
}
}
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java?rev=1405567&r1=1405566&r2=1405567&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java
Sun Nov 4 15:43:15 2012
@@ -32,6 +32,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
/**
@@ -141,8 +142,8 @@ public class ThreadContextMapFilter exte
return null;
}
boolean isAnd = oper == null || !oper.equalsIgnoreCase("or");
- Result onMatch = match == null ? null :
Result.valueOf(match.toUpperCase());
- Result onMismatch = mismatch == null ? null :
Result.valueOf(mismatch.toUpperCase());
+ Result onMatch = match == null ? null :
Result.valueOf(match.toUpperCase(Locale.ENGLISH));
+ Result onMismatch = mismatch == null ? null :
Result.valueOf(mismatch.toUpperCase(Locale.ENGLISH));
return new ThreadContextMapFilter(map, isAnd, onMatch, onMismatch);
}
}
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java?rev=1405567&r1=1405566&r2=1405567&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java
Sun Nov 4 15:43:15 2012
@@ -16,6 +16,8 @@
*/
package org.apache.logging.log4j.core.filter;
+import java.util.Locale;
+
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.core.LogEvent;
@@ -83,9 +85,9 @@ public final class ThresholdFilter exten
public static ThresholdFilter createFilter(@PluginAttr("level") String
loggerLevel,
@PluginAttr("onMatch") String
match,
@PluginAttr("onMismatch")
String mismatch) {
- Level level = loggerLevel == null ? Level.ERROR :
Level.toLevel(loggerLevel.toUpperCase());
- Result onMatch = match == null ? Result.NEUTRAL :
Result.valueOf(match.toUpperCase());
- Result onMismatch = mismatch == null ? Result.DENY :
Result.valueOf(mismatch.toUpperCase());
+ Level level = loggerLevel == null ? Level.ERROR :
Level.toLevel(loggerLevel.toUpperCase(Locale.ENGLISH));
+ Result onMatch = match == null ? Result.NEUTRAL :
Result.valueOf(match.toUpperCase(Locale.ENGLISH));
+ Result onMismatch = mismatch == null ? Result.DENY :
Result.valueOf(mismatch.toUpperCase(Locale.ENGLISH));
return new ThresholdFilter(level, onMatch, onMismatch);
}
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java?rev=1405567&r1=1405566&r2=1405567&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
Sun Nov 4 15:43:15 2012
@@ -24,6 +24,7 @@ import org.apache.logging.log4j.core.con
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
+import java.util.Locale;
import java.util.TimeZone;
/**
@@ -126,8 +127,8 @@ public final class TimeFilter extends Ab
}
}
TimeZone timezone = (tz == null) ? TimeZone.getDefault() :
TimeZone.getTimeZone(tz);
- Result onMatch = match == null ? Result.NEUTRAL :
Result.valueOf(match.toUpperCase());
- Result onMismatch = mismatch == null ? Result.DENY :
Result.valueOf(mismatch.toUpperCase());
+ Result onMatch = match == null ? Result.NEUTRAL :
Result.valueOf(match.toUpperCase(Locale.ENGLISH));
+ Result onMismatch = mismatch == null ? Result.DENY :
Result.valueOf(mismatch.toUpperCase(Locale.ENGLISH));
return new TimeFilter(s, e, timezone, onMatch, onMismatch);
}
