Author: sdeboy
Date: Fri Apr 30 20:36:39 2010
New Revision: 939808
URL: http://svn.apache.org/viewvc?rev=939808&view=rev
Log:
Undo last regexp build change to logfilepatternreceiver (was correct)
Modified:
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java
Modified:
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java?rev=939808&r1=939807&r2=939808&view=diff
==============================================================================
---
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java
(original)
+++
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java
Fri Apr 30 20:36:39 2010
@@ -709,10 +709,11 @@ public class LogFilePatternReceiver exte
newPattern = util.substitute("s/" + MULTIPLE_SPACES_REGEXP +"/" +
MULTIPLE_SPACES_REGEXP + "/g", newPattern);
newPattern = globalReplace(PATTERN_WILDCARD, REGEXP_DEFAULT_WILDCARD,
newPattern);
- for (int i = 0;i<matchingKeywords.size();i++) {
- String keyword = (String) matchingKeywords.get(i);
+ //use buildingKeywords here to ensure correct order
+ for (int i = 0;i<buildingKeywords.size();i++) {
+ String keyword = (String) buildingKeywords.get(i);
//make the final keyword greedy (we're assuming it's the message)
- if (i == (matchingKeywords.size() - 1)) {
+ if (i == (buildingKeywords.size() - 1)) {
newPattern = singleReplace(newPattern, String.valueOf(i),
GREEDY_GROUP);
} else if (TIMESTAMP.equals(keyword)) {
newPattern = singleReplace(newPattern, String.valueOf(i), "(" +
timestampPatternText + ")");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
