sdeboy 2004/05/21 18:17:02
Modified: src/java/org/apache/log4j/xml UtilLoggingXMLDecoder.java
XMLDecoder.java
src/java/org/apache/log4j/chainsaw FileLoadAction.java
ChainsawAppenderHandler.java
src/java/org/apache/log4j/chainsaw/help release-notes.html
Log:
Corrected xmldecoder bug - null exceptions should be assigned a single-element empty
string to prevent npes
Corrected file-load of xml formatted events to conform to responsiveness and cyclic
buffer settings - both issues discovered by Stephen Pain
Revision Changes Path
1.13 +2 -1
logging-log4j/src/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java
Index: UtilLoggingXMLDecoder.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- UtilLoggingXMLDecoder.java 21 May 2004 06:19:32 -0000 1.12
+++ UtilLoggingXMLDecoder.java 22 May 2004 01:17:01 -0000 1.13
@@ -368,8 +368,9 @@
} else {
info = LocationInfo.NA_LOCATION_INFO;
}
+
if (exception == null) {
- exception = new String[]{};
+ exception = new String[]{""};
}
LoggingEvent loggingEvent = new LoggingEvent();
1.16 +1 -1 logging-log4j/src/java/org/apache/log4j/xml/XMLDecoder.java
Index: XMLDecoder.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/xml/XMLDecoder.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- XMLDecoder.java 21 May 2004 10:50:39 -0000 1.15
+++ XMLDecoder.java 22 May 2004 01:17:01 -0000 1.16
@@ -383,7 +383,7 @@
info = LocationInfo.NA_LOCATION_INFO;
}
if (exception == null) {
- exception = new String[]{};
+ exception = new String[]{""};
}
LoggingEvent loggingEvent = new LoggingEvent();
1.10 +6 -1
logging-log4j/src/java/org/apache/log4j/chainsaw/FileLoadAction.java
Index: FileLoadAction.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/FileLoadAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FileLoadAction.java 23 Mar 2004 07:00:22 -0000 1.9
+++ FileLoadAction.java 22 May 2004 01:17:01 -0000 1.10
@@ -21,6 +21,7 @@
import java.io.IOException;
import java.net.URL;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
import java.util.Vector;
@@ -32,6 +33,7 @@
import org.apache.log4j.Decoder;
import org.apache.log4j.Logger;
import org.apache.log4j.helpers.Constants;
+import org.apache.log4j.spi.LoggingEvent;
/**
@@ -147,7 +149,10 @@
public void run() {
try {
Vector events = decoder.decode(urlToUse);
- parent.handler.appendBatch(events);
+ Iterator iter = events.iterator();
+ while (iter.hasNext()) {
+ parent.handler.append((LoggingEvent)iter.next());
+ }
} catch (IOException e1) {
// TODO Handle the error with a nice msg
LOG.error(e1);
1.21 +9 -21
logging-log4j/src/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java
Index: ChainsawAppenderHandler.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ChainsawAppenderHandler.java 12 May 2004 15:39:03 -0000 1.20
+++ ChainsawAppenderHandler.java 22 May 2004 01:17:01 -0000 1.21
@@ -16,20 +16,9 @@
package org.apache.log4j.chainsaw;
-import org.apache.log4j.AppenderSkeleton;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.helpers.LogLog;
-import org.apache.log4j.net.SocketReceiver;
-import org.apache.log4j.rule.ExpressionRule;
-import org.apache.log4j.rule.Rule;
-import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.spi.LoggingEventFieldResolver;
-
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
-
import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -38,6 +27,15 @@
import javax.swing.event.EventListenerList;
+import org.apache.log4j.AppenderSkeleton;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.helpers.LogLog;
+import org.apache.log4j.net.SocketReceiver;
+import org.apache.log4j.rule.ExpressionRule;
+import org.apache.log4j.rule.Rule;
+import org.apache.log4j.spi.LoggingEvent;
+import org.apache.log4j.spi.LoggingEventFieldResolver;
+
/**
* A handler class that either extends a particular appender hierarchy or can be
bound
@@ -98,16 +96,6 @@
public void append(LoggingEvent event) {
worker.enqueue(event);
- }
-
- /**
- * Allows a Collection of events to be posted into this handler
- */
- public void appendBatch(Collection events) {
- for (Iterator iter = events.iterator(); iter.hasNext();) {
- LoggingEvent element = (LoggingEvent) iter.next();
- append(element);
- }
}
public void close() {
1.7 +8 -1
logging-log4j/src/java/org/apache/log4j/chainsaw/help/release-notes.html
Index: release-notes.html
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/help/release-notes.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- release-notes.html 21 May 2004 06:27:31 -0000 1.6
+++ release-notes.html 22 May 2004 01:17:02 -0000 1.7
@@ -9,9 +9,16 @@
<h3>1.99.99 (18th May 2004 10:35 GMT+10)</h3>
+
+<h2>21 May 2004</h2>
+<ul>
+ <li>Corrected a bug in XML decoders which caused an exceptio when rendering the
exception column - discovered by Stephen Pain.</li>
+<li>Events loaded from an XML-formatted file are now processed like other events
(throttled based on responsiveness setting and conforming to cyclic buffer limits) -
discovered by Stephen Pain.</li>
+</ul>
+
<h2>20 May 2004</h2>
<ul>
- <li>Corrected a bug in the XML decoders which prevented XML-formatted events from
being processed.</li>
+ <li>Corrected a bug in the XML decoders which prevented XML-formatted events from
being processed - discovered by Stephen Pain.</li>
</ul>
<h2>18 May 2004</h2>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
