Close resources properly for java tests and examples.

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();