commit 1ece276659cb52c28d98b058770b68d68d03b809
author alanb <none@none> Sat Jun 19 15:17:36 2010 +0100
committer alanb <none@none> Sat Jun 19 15:17:36 2010 +0100
tree 8cb10a30296e5f88d136bf93f7ecec83e687a2be
parent c64a62443a061ff3748b07c239a310ade9464a64

6962419: TEST_BUG: java_io tests fails in samevm mode
Reviewed-by: ohair, sherman

test/java/io/InputStream/OpsAfterClose.java

diff --git a/test/java/io/InputStream/OpsAfterClose.java b/test/java/io/InputStream/OpsAfterClose.java
index 7c64c98..9685782 100644
--- a/test/java/io/InputStream/OpsAfterClose.java
+++ b/test/java/io/InputStream/OpsAfterClose.java
@@ -125,23 +125,35 @@
         f.deleteOnExit();
 
         FileInputStream fis = new FileInputStream(f);
-        if (testInputStream(fis)) {
-            failed = true;
-        }
-        if (testFileInputStream(fis)) {
-            failed = true;
+        try {
+            if (testInputStream(fis)) {
+                failed = true;
+            }
+            if (testFileInputStream(fis)) {
+                failed = true;
+            }
+        } finally {
+            fis.close();
         }
 
         BufferedInputStream bs =  new BufferedInputStream(
                                         new FileInputStream(f));
-        if (testInputStream(bs)) {
-            failed = true;
+        try {
+            if (testInputStream(bs)) {
+                failed = true;
+            }
+        } finally {
+            bs.close();
         }
 
         DataInputStream dis = new DataInputStream(
                                 new FileInputStream(f));
-        if (testInputStream(dis)) {
-            failed = true;
+        try {
+            if (testInputStream(dis)) {
+                failed = true;
+            }
+        } finally {
+            dis.close();
         }
 
         PushbackInputStream pbis = new PushbackInputStream(

test/java/io/InputStream/ReadParams.java

diff --git a/test/java/io/InputStream/ReadParams.java b/test/java/io/InputStream/ReadParams.java
index 36713aa..602445c 100644
--- a/test/java/io/InputStream/ReadParams.java
+++ b/test/java/io/InputStream/ReadParams.java
@@ -137,6 +137,7 @@
         oos.writeInt(12345);
         oos.writeObject("Today");
         oos.writeObject(new Integer(32));
+        oos.close();
         ObjectInputStream ois = new ObjectInputStream(new FileInputStream(fn));
         doTest(ois);
         doTest1(ois);