make MessageReader/Writer use buffered streams

3 files changed, 9 insertions, 3 deletions

diff --git a/changelog b/changelog
index 2f36a2c..c169e5f 100644
--- a/changelog
+++ b/changelog
@@ -8,6 +8,8 @@ Version 2.6.1:
 			court -at- venture3systems -dot- com>)
 	* Fix signal handling bug in DBusDaemon (Spotted by Markus Gaebelein 
 			<Markus -dot- Gaebelein -at- fiducia -dot- de>)
+	* Make MessageReader/Writer use Buffered streams to try and improve
+			performance
 
 Version 2.6:
 
diff --git a/org/freedesktop/dbus/MessageReader.java b/org/freedesktop/dbus/MessageReader.java
index 4f1437d..49c69cd 100644
--- a/org/freedesktop/dbus/MessageReader.java
+++ b/org/freedesktop/dbus/MessageReader.java
@@ -12,9 +12,10 @@ package org.freedesktop.dbus;
 
 import static org.freedesktop.dbus.Gettext._;
 
+import java.io.BufferedInputStream;
+import java.io.EOFException;
 import java.io.InputStream;
 import java.io.IOException;
-import java.io.EOFException;
 import java.net.SocketTimeoutException;
 import java.text.MessageFormat;
 
@@ -35,7 +36,7 @@ public class MessageReader
    private int[] len = new int[4];
    public MessageReader(InputStream in)
    {
-      this.in = in;
+      this.in = new BufferedInputStream(in);
    }
    public Message readMessage() throws IOException, DBusException
    {
diff --git a/org/freedesktop/dbus/MessageWriter.java b/org/freedesktop/dbus/MessageWriter.java
index 00fb7f2..e95bf78 100644
--- a/org/freedesktop/dbus/MessageWriter.java
+++ b/org/freedesktop/dbus/MessageWriter.java
@@ -10,6 +10,7 @@
 */
 package org.freedesktop.dbus;
 
+import java.io.BufferedOutputStream;
 import java.io.OutputStream;
 import java.io.IOException;
 
@@ -23,13 +24,15 @@ public class MessageWriter
 	private boolean isunix;
    public MessageWriter(OutputStream out)
    {
-      this.out = out;
+		this.out = out;
 		this.isunix = false;
 		try {
 			if (out instanceof USOutputStream)
 				this.isunix = true;
 		} catch (Throwable t) {
 		}
+		if (!this.isunix)
+			this.out = new BufferedOutputStream(this.out);
    }
    public void writeMessage(Message m) throws IOException
    {