sdeboy 2004/04/13 22:38:12
Modified: src/java/org/apache/log4j/net MulticastReceiver.java
UDPReceiver.java XMLSocketNode.java
src/java/org/apache/log4j/xml UtilLoggingXMLDecoder.java
Log:
Avoid using trim where possible in receivers and util logging xml decoder.
Revision Changes Path
1.5 +3 -3
logging-log4j/src/java/org/apache/log4j/net/MulticastReceiver.java
Index: MulticastReceiver.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/net/MulticastReceiver.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MulticastReceiver.java 27 Feb 2004 16:47:32 -0000 1.4
+++ MulticastReceiver.java 14 Apr 2004 05:38:12 -0000 1.5
@@ -193,7 +193,7 @@
while (iter.hasNext()) {
String data = (String) iter.next();
- List v = decoderImpl.decodeEvents(data);
+ List v = decoderImpl.decodeEvents(data.trim());
if (v != null) {
Iterator eventIter = v.iterator();
@@ -238,10 +238,10 @@
//null
if (encoding == null) {
handlerThread.append(
- new String(p.getData(), 0, p.getLength()).trim());
+ new String(p.getData(), 0, p.getLength()));
} else {
handlerThread.append(
- new String(p.getData(), 0, p.getLength(), encoding).trim());
+ new String(p.getData(), 0, p.getLength(), encoding));
}
} catch (SocketException se) {
//disconnected
1.5 +3 -3 logging-log4j/src/java/org/apache/log4j/net/UDPReceiver.java
Index: UDPReceiver.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/net/UDPReceiver.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UDPReceiver.java 27 Feb 2004 16:47:32 -0000 1.4
+++ UDPReceiver.java 14 Apr 2004 05:38:12 -0000 1.5
@@ -169,7 +169,7 @@
while (iter.hasNext()) {
String data = (String) iter.next();
- List v = decoderImpl.decodeEvents(data);
+ List v = decoderImpl.decodeEvents(data.trim());
if (v != null) {
Iterator eventIter = v.iterator();
@@ -220,10 +220,10 @@
//null
if (encoding == null) {
handlerThread.append(
- new String(p.getData(), 0, p.getLength()).trim());
+ new String(p.getData(), 0, p.getLength()));
} else {
handlerThread.append(
- new String(p.getData(), 0, p.getLength(), encoding).trim());
+ new String(p.getData(), 0, p.getLength(), encoding));
}
} catch (SocketException se) {
//disconnected
1.5 +2 -2 logging-log4j/src/java/org/apache/log4j/net/XMLSocketNode.java
Index: XMLSocketNode.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/net/XMLSocketNode.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLSocketNode.java 27 Feb 2004 16:47:32 -0000 1.4
+++ XMLSocketNode.java 14 Apr 2004 05:38:12 -0000 1.5
@@ -133,8 +133,8 @@
//it's up to the individual decoder to handle incomplete event data
while (true) {
byte[] b=new byte[1024];
- is.read(b);
- List v= decoder.decodeEvents(new String(b).trim());
+ int length = is.read(b);
+ List v= decoder.decodeEvents(new String(b, 0, length));
if (v != null) {
Iterator iter = v.iterator();
1.8 +0 -3
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- UtilLoggingXMLDecoder.java 28 Mar 2004 10:04:31 -0000 1.7
+++ UtilLoggingXMLDecoder.java 14 Apr 2004 05:38:12 -0000 1.8
@@ -111,8 +111,6 @@
* resetting the length of the StringBuffer is dangerous, particularly
* on some JDK 1.4 impls, there's a known Bug that causes a memory leak
*/
- data = data.trim();
-
StringBuffer buf = new StringBuffer(1024);
if (!data.startsWith("<?xml")) {
@@ -194,7 +192,6 @@
public Vector decodeEvents(String document) {
if (document != null) {
- document = document.trim();
if (document.equals("")) {
return null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
