Mailing-List: contact log4j-dev-help@logging.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "Log4J Developers List" <log4j-dev@logging.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r939804 -
 /logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java
Date: Fri, 30 Apr 2010 20:31:42 -0000
To: log4j-cvs@logging.apache.org
From: sdeboy@apache.org
Message-Id: <20100430203143.0656D23889CB@eris.apache.org>

Author: sdeboy
Date: Fri Apr 30 20:31:42 2010
New Revision: 939804

URL: http://svn.apache.org/viewvc?rev=939804&view=rev
Log:
Fix case sensitive property loading issue in Chainsaw
Fix bug in logFormat regexp creation logic in logfilepatternreceiver

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=939804&r1=939803&r2=939804&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:31:42 2010
@@ -709,10 +709,10 @@ 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<buildingKeywords.size();i++) {
-      String keyword = (String) buildingKeywords.get(i);
+    for (int i = 0;i<matchingKeywords.size();i++) {
+      String keyword = (String) matchingKeywords.get(i);
       //make the final keyword greedy (we're assuming it's the message)
-      if (i == (buildingKeywords.size() - 1)) {
+      if (i == (matchingKeywords.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: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org