You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by sd...@apache.org on 2003/05/22 00:59:19 UTC
cvs commit: jakarta-log4j-sandbox/src/java/org/apache/log4j/xml UtilLoggingXMLDecoder.java XMLDecoder.java
sdeboy 2003/05/21 15:59:19
Modified: src/java/org/apache/log4j/net MulticastAppender.java
UDPAppender.java
src/java/org/apache/log4j/xml UtilLoggingXMLDecoder.java
XMLDecoder.java
Log:
corrected potential byte length errors in udp/multicast appenders, made xml parse error checking consistent
Revision Changes Path
1.2 +5 -2 jakarta-log4j-sandbox/src/java/org/apache/log4j/net/MulticastAppender.java
Index: MulticastAppender.java
===================================================================
RCS file: /home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/net/MulticastAppender.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MulticastAppender.java 29 Apr 2003 16:21:30 -0000 1.1
+++ MulticastAppender.java 21 May 2003 22:59:19 -0000 1.2
@@ -85,6 +85,8 @@
The default port number for the multicast packets. (9991).
*/
static final int DEFAULT_PORT = 9991;
+
+ private static final int PACKET_LENGTH = 8192;
/**
The default reconnection delay (30000 milliseconds or 30 seconds).
@@ -225,9 +227,10 @@
}
try {
- byte[] logData = this.layout.format(event).trim().getBytes("ASCII");
+ StringBuffer buf=new StringBuffer(layout.format(event).trim());
+ buf.append(new char[PACKET_LENGTH - buf.length()]);
DatagramPacket dp =
- new DatagramPacket(logData, logData.length, address, port);
+ new DatagramPacket(buf.toString().getBytes("ASCII"), buf.length(), address, port);
outSocket.send(dp);
} catch (IOException e) {
outSocket = null;
1.3 +5 -2 jakarta-log4j-sandbox/src/java/org/apache/log4j/net/UDPAppender.java
Index: UDPAppender.java
===================================================================
RCS file: /home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/net/UDPAppender.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UDPAppender.java 29 Apr 2003 16:21:30 -0000 1.2
+++ UDPAppender.java 21 May 2003 22:59:19 -0000 1.3
@@ -88,6 +88,8 @@
*/
static final int DEFAULT_PORT = 9991;
+ private static final int PACKET_LENGTH = 8192;
+
/**
The default reconnection delay (30000 milliseconds or 30 seconds).
*/
@@ -237,9 +239,10 @@
}
try {
- byte[] logData = this.layout.format(event).trim().getBytes("ASCII");
+ StringBuffer buf=new StringBuffer(layout.format(event).trim());
+ buf.append(new char[PACKET_LENGTH - buf.length()]);
DatagramPacket dp =
- new DatagramPacket(logData, logData.length, address, port);
+ new DatagramPacket(buf.toString().getBytes("ASCII"), buf.length(), address, port);
outSocket.send(dp);
} catch (IOException e) {
outSocket = null;
1.10 +7 -3 jakarta-log4j-sandbox/src/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java
Index: UtilLoggingXMLDecoder.java
===================================================================
RCS file: /home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- UtilLoggingXMLDecoder.java 18 May 2003 04:27:41 -0000 1.9
+++ UtilLoggingXMLDecoder.java 21 May 2003 22:59:19 -0000 1.10
@@ -216,6 +216,10 @@
public Vector decode(File file) throws IOException {
String fileContents = loadFileSource(file);
Document doc = parse(fileContents);
+
+ if (doc == null) {
+ return null;
+ }
return decodeEvents(doc);
}
@@ -250,10 +254,10 @@
partialEvent=newPartialEvent;
Document doc = parse(newDoc);
-
- if (doc != null) {
- return decodeEvents(doc);
+ if (doc == null) {
+ return null;
}
+ return decodeEvents(doc);
}
}
return null;
1.10 +8 -1 jakarta-log4j-sandbox/src/java/org/apache/log4j/xml/XMLDecoder.java
Index: XMLDecoder.java
===================================================================
RCS file: /home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/xml/XMLDecoder.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XMLDecoder.java 20 May 2003 11:50:40 -0000 1.9
+++ XMLDecoder.java 21 May 2003 22:59:19 -0000 1.10
@@ -206,13 +206,20 @@
String fileContents = loadFileSource(file);
Document doc = parse(fileContents);
+ if (doc == null) {
+ return null;
+ }
return decodeEvents(doc);
}
public Vector decodeEvents(String document) {
if (document != null) {
Document doc = parse(document);
- return decodeEvents(doc);
+ if (doc == null) {
+ return null;
+ }
+
+ return decodeEvents(doc);
}
return null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: log4j-dev-help@jakarta.apache.org