Author: carnold
Date: Thu Aug 16 23:06:17 2007
New Revision: 566930
URL: http://svn.apache.org/viewvc?view=rev&rev=566930
Log:
Bug 40937: Avoid Turkish-I problem in ExpressionFilter
Modified:
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/spi/LoggingEventFieldResolver.java
Modified:
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/spi/LoggingEventFieldResolver.java
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/spi/LoggingEventFieldResolver.java?view=diff&rev=566930&r1=566929&r2=566930
==============================================================================
---
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/spi/LoggingEventFieldResolver.java
(original)
+++
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/spi/LoggingEventFieldResolver.java
Thu Aug 16 23:06:17 2007
@@ -20,7 +20,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
-
+import java.util.Locale;
/**
@@ -160,7 +160,7 @@
while (tokenizer.hasMoreTokens()) {
String token = tokenizer.nextToken();
- if (isField(token) || token.toUpperCase().startsWith(PROP_FIELD)) {
+ if (isField(token) ||
token.toUpperCase(Locale.US).startsWith(PROP_FIELD)) {
result.append(getValue(token, event).toString());
found = true;
} else {
@@ -189,7 +189,7 @@
public boolean isField(final String fieldName) {
if (fieldName != null) {
return (KEYWORD_LIST.contains(
- fieldName.toUpperCase())
+ fieldName.toUpperCase(Locale.US))
|| fieldName.toUpperCase().startsWith(PROP_FIELD));
}
return false;
@@ -203,7 +203,7 @@
*/
public Object getValue(final String fieldName,
final LoggingEvent event) {
- String upperField = fieldName.toUpperCase();
+ String upperField = fieldName.toUpperCase(Locale.US);
if (LOGGER_FIELD.equals(upperField)) {
return event.getLoggerName();
} else if (LEVEL_FIELD.equals(upperField)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
