diff options
author | liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2011-06-07 03:51:33 +0000 |
---|---|---|
committer | liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2011-06-07 03:51:33 +0000 |
commit | 3239fec94cdd7876130b87070d2d71148d9ef50b (patch) | |
tree | 1c4794621bf75557a5174b5495806fbc9e09cfd3 /java/src | |
parent | e8e6eed0bed9db46b71fb79f8582680f8b09191a (diff) | |
download | protobuf-3239fec94cdd7876130b87070d2d71148d9ef50b.tar.gz protobuf-3239fec94cdd7876130b87070d2d71148d9ef50b.tar.bz2 protobuf-3239fec94cdd7876130b87070d2d71148d9ef50b.zip |
Close resources properly for java tests and examples.
Diffstat (limited to 'java/src')
-rw-r--r-- | java/src/test/java/com/google/protobuf/GeneratedMessageTest.java | 14 | ||||
-rw-r--r-- | java/src/test/java/com/google/protobuf/LiteTest.java | 7 |
2 files changed, 15 insertions, 6 deletions
diff --git a/java/src/test/java/com/google/protobuf/GeneratedMessageTest.java b/java/src/test/java/com/google/protobuf/GeneratedMessageTest.java index b9dd40bf..acb22355 100644 --- a/java/src/test/java/com/google/protobuf/GeneratedMessageTest.java +++ b/java/src/test/java/com/google/protobuf/GeneratedMessageTest.java @@ -775,8 +775,11 @@ public class GeneratedMessageTest extends TestCase { TestUtil.setAllFields(builder); TestAllTypes expected = builder.build(); ObjectOutputStream out = new ObjectOutputStream(baos); - out.writeObject(expected); - out.close(); + try { + out.writeObject(expected); + } finally { + out.close(); + } ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); ObjectInputStream in = new ObjectInputStream(bais); TestAllTypes actual = (TestAllTypes) in.readObject(); @@ -788,8 +791,11 @@ public class GeneratedMessageTest extends TestCase { TestAllTypes.Builder builder = TestAllTypes.newBuilder(); TestAllTypes expected = builder.buildPartial(); ObjectOutputStream out = new ObjectOutputStream(baos); - out.writeObject(expected); - out.close(); + try { + out.writeObject(expected); + } finally { + out.close(); + } ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); ObjectInputStream in = new ObjectInputStream(bais); TestAllTypes actual = (TestAllTypes) in.readObject(); diff --git a/java/src/test/java/com/google/protobuf/LiteTest.java b/java/src/test/java/com/google/protobuf/LiteTest.java index 4e1003d9..839694d6 100644 --- a/java/src/test/java/com/google/protobuf/LiteTest.java +++ b/java/src/test/java/com/google/protobuf/LiteTest.java @@ -129,8 +129,11 @@ public class LiteTest extends TestCase { TestAllTypesLite.NestedMessage.newBuilder().setBb(7)) .build(); ObjectOutputStream out = new ObjectOutputStream(baos); - out.writeObject(expected); - out.close(); + try { + out.writeObject(expected); + } finally { + out.close(); + } ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); ObjectInputStream in = new ObjectInputStream(bais); TestAllTypesLite actual = (TestAllTypesLite) in.readObject(); |