From fe58fb4c30031174e83e005e8ec7c82919fa0cf3 Mon Sep 17 00:00:00 2001 From: akwizgran <akwizgran@users.sourceforge.net> Date: Fri, 22 Jul 2011 17:57:25 +0100 Subject: [PATCH] Fixed more unit tests. --- components/net/sf/briar/protocol/BundleWriterImpl.java | 5 +---- components/net/sf/briar/protocol/MessageEncoderImpl.java | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/components/net/sf/briar/protocol/BundleWriterImpl.java b/components/net/sf/briar/protocol/BundleWriterImpl.java index ca4096d16e..f8fb1a66aa 100644 --- a/components/net/sf/briar/protocol/BundleWriterImpl.java +++ b/components/net/sf/briar/protocol/BundleWriterImpl.java @@ -69,10 +69,7 @@ class BundleWriterImpl implements BundleWriter { // Write the data writer.writeListStart(); // Bypass the writer and write each raw message directly - for(Raw message : messages) { - writer.writeUserDefinedTag(Tags.MESSAGE); - out.write(message.getBytes()); - } + for(Raw message : messages) out.write(message.getBytes()); writer.writeListEnd(); // Stop digesting out.on(false); diff --git a/components/net/sf/briar/protocol/MessageEncoderImpl.java b/components/net/sf/briar/protocol/MessageEncoderImpl.java index 339ece3b76..2ab66d017d 100644 --- a/components/net/sf/briar/protocol/MessageEncoderImpl.java +++ b/components/net/sf/briar/protocol/MessageEncoderImpl.java @@ -12,6 +12,7 @@ import net.sf.briar.api.protocol.GroupId; import net.sf.briar.api.protocol.Message; import net.sf.briar.api.protocol.MessageEncoder; import net.sf.briar.api.protocol.MessageId; +import net.sf.briar.api.protocol.Tags; import net.sf.briar.api.serial.Writer; import net.sf.briar.api.serial.WriterFactory; @@ -35,6 +36,7 @@ class MessageEncoderImpl implements MessageEncoder { ByteArrayOutputStream out = new ByteArrayOutputStream(); Writer w = writerFactory.createWriter(out); // Write the message + w.writeUserDefinedTag(Tags.MESSAGE); parent.writeTo(w); group.writeTo(w); w.writeInt64(timestamp); -- GitLab