From 5d000b62f81452ca992c3ff0db1ddc5f43c50ccf Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Fri, 22 Jul 2011 18:08:05 +0100
Subject: [PATCH] Removed Writer.close().
---
api/net/sf/briar/api/serial/Writer.java | 2 +-
components/net/sf/briar/protocol/BundleWriterImpl.java | 3 ++-
components/net/sf/briar/protocol/MessageEncoderImpl.java | 2 --
components/net/sf/briar/serial/WriterImpl.java | 5 -----
test/net/sf/briar/protocol/BatchReaderTest.java | 2 --
test/net/sf/briar/protocol/BundleReaderImplTest.java | 4 ----
test/net/sf/briar/protocol/HeaderReaderTest.java | 2 --
7 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/api/net/sf/briar/api/serial/Writer.java b/api/net/sf/briar/api/serial/Writer.java
index ba4f3d2556..b3b7942b32 100644
--- a/api/net/sf/briar/api/serial/Writer.java
+++ b/api/net/sf/briar/api/serial/Writer.java
@@ -6,8 +6,8 @@ import java.util.Map;
public interface Writer {
+ // FIXME: Remove this method
long getBytesWritten();
- void close() throws IOException;
void writeBoolean(boolean b) throws IOException;
diff --git a/components/net/sf/briar/protocol/BundleWriterImpl.java b/components/net/sf/briar/protocol/BundleWriterImpl.java
index f8fb1a66aa..10886002bc 100644
--- a/components/net/sf/briar/protocol/BundleWriterImpl.java
+++ b/components/net/sf/briar/protocol/BundleWriterImpl.java
@@ -84,7 +84,8 @@ class BundleWriterImpl implements BundleWriter {
}
if(state != State.MORE_BATCHES) throw new IllegalStateException();
writer.writeListEnd();
- writer.close();
+ out.flush();
+ out.close();
state = State.END;
}
}
diff --git a/components/net/sf/briar/protocol/MessageEncoderImpl.java b/components/net/sf/briar/protocol/MessageEncoderImpl.java
index 2ab66d017d..11a99d6f39 100644
--- a/components/net/sf/briar/protocol/MessageEncoderImpl.java
+++ b/components/net/sf/briar/protocol/MessageEncoderImpl.java
@@ -52,7 +52,6 @@ class MessageEncoderImpl implements MessageEncoder {
// Write the signature
w.writeRaw(sig);
byte[] raw = out.toByteArray();
- w.close();
// The message ID is the hash of the entire message
messageDigest.reset();
messageDigest.update(raw);
@@ -62,7 +61,6 @@ class MessageEncoderImpl implements MessageEncoder {
w = writerFactory.createWriter(out);
w.writeString(nick);
w.writeRaw(keyPair.getPublic().getEncoded());
- w.close();
messageDigest.reset();
messageDigest.update(out.toByteArray());
AuthorId authorId = new AuthorId(messageDigest.digest());
diff --git a/components/net/sf/briar/serial/WriterImpl.java b/components/net/sf/briar/serial/WriterImpl.java
index bb27a56aaa..b14c7fed51 100644
--- a/components/net/sf/briar/serial/WriterImpl.java
+++ b/components/net/sf/briar/serial/WriterImpl.java
@@ -25,11 +25,6 @@ class WriterImpl implements Writer {
return bytesWritten;
}
- public void close() throws IOException {
- out.flush();
- out.close();
- }
-
public void writeBoolean(boolean b) throws IOException {
if(b) out.write(Tag.TRUE);
else out.write(Tag.FALSE);
diff --git a/test/net/sf/briar/protocol/BatchReaderTest.java b/test/net/sf/briar/protocol/BatchReaderTest.java
index 6eaa425be7..b82d9d253c 100644
--- a/test/net/sf/briar/protocol/BatchReaderTest.java
+++ b/test/net/sf/briar/protocol/BatchReaderTest.java
@@ -152,7 +152,6 @@ public class BatchReaderTest extends TestCase {
w.writeUserDefinedTag(Tags.MESSAGE);
w.writeRaw(new byte[size - 10]);
w.writeListEnd();
- w.close();
byte[] b = out.toByteArray();
assertEquals(size, b.length);
return b;
@@ -164,7 +163,6 @@ public class BatchReaderTest extends TestCase {
w.writeUserDefinedTag(Tags.BATCH);
w.writeListStart();
w.writeListEnd();
- w.close();
return out.toByteArray();
}
diff --git a/test/net/sf/briar/protocol/BundleReaderImplTest.java b/test/net/sf/briar/protocol/BundleReaderImplTest.java
index d7fd003765..794adc310c 100644
--- a/test/net/sf/briar/protocol/BundleReaderImplTest.java
+++ b/test/net/sf/briar/protocol/BundleReaderImplTest.java
@@ -72,7 +72,6 @@ public class BundleReaderImplTest extends TestCase {
w.writeUserDefinedTag(Tags.BATCH);
w.writeList(Collections.emptyList());
w.writeListEnd();
- w.close();
byte[] headless = out.toByteArray();
// Try to read a header from the headless bundle
ByteArrayInputStream in = new ByteArrayInputStream(headless);
@@ -96,7 +95,6 @@ public class BundleReaderImplTest extends TestCase {
w.writeList(Collections.emptyList()); // Subs
w.writeMap(Collections.emptyMap()); // Transports
w.writeInt64(System.currentTimeMillis()); // Timestamp
- w.close();
byte[] headerOnly = out.toByteArray();
// Try to read a header from the header-only bundle
ByteArrayInputStream in = new ByteArrayInputStream(headerOnly);
@@ -122,7 +120,6 @@ public class BundleReaderImplTest extends TestCase {
w.writeInt64(System.currentTimeMillis()); // Timestamp
w.writeListStart();
w.writeListEnd();
- w.close();
byte[] batchless = out.toByteArray();
// It should be possible to read the header and null
ByteArrayInputStream in = new ByteArrayInputStream(batchless);
@@ -210,7 +207,6 @@ public class BundleReaderImplTest extends TestCase {
w.writeUserDefinedTag(Tags.BATCH);
w.writeList(Collections.emptyList()); // Messages
w.writeListEnd();
- w.close();
return out.toByteArray();
}
diff --git a/test/net/sf/briar/protocol/HeaderReaderTest.java b/test/net/sf/briar/protocol/HeaderReaderTest.java
index af2648e9bf..e934c59ba9 100644
--- a/test/net/sf/briar/protocol/HeaderReaderTest.java
+++ b/test/net/sf/briar/protocol/HeaderReaderTest.java
@@ -133,7 +133,6 @@ public class HeaderReaderTest extends TestCase {
w.writeMapEnd();
// Timestamp
w.writeInt64(System.currentTimeMillis());
- w.close();
assertEquals(size, out.size());
return out.toByteArray();
}
@@ -153,7 +152,6 @@ public class HeaderReaderTest extends TestCase {
w.writeMapEnd();
// Timestamp
w.writeInt64(System.currentTimeMillis());
- w.close();
return out.toByteArray();
}
}
--
GitLab