Merge lp:~pbeaman/akiban-persistit/close-dump-task-test-streams into lp:akiban-persistit

[Peter Beaman]

Adds code to close ZipInputStream and DataInputStrem in DumpTaskTest.

This is motivated by bug https://bugs.launchpad.net/akiban-persistit/+bug/1084260 which is a recurring annoyance. These changes probably won't fix that bug, but since we we think everything else is cleaned up properly this is an experiment to just to see whether there's some mechanism we don't understand going on here.

And anyway, it can't hurt...

[Nathan Williams (nwilliams)]

Simple enough.

review: Approve

=== modified file 'src/test/java/com/persistit/DumpTaskTest.java'
--- src/test/java/com/persistit/DumpTaskTest.java	2012-11-25 20:14:58 +0000
+++ src/test/java/com/persistit/DumpTaskTest.java	2012-11-28 21:53:20 +0000
@@ -67,8 +67,6 @@
     @Test
     public void testDumpCommand() throws Exception {
         store1();
-        final Volume volume = _persistit.getVolume("persistit");
-        final Buffer buffer = _persistit.getBufferPool(16384).getBufferCopy(volume, 1);
         final CLI cli = new CLI(_persistit, null, null);
         final File file = File.createTempFile("DumpTaskTest", ".zip");
         file.deleteOnExit();
@@ -76,11 +74,22 @@
         task.setPersistit(_persistit);
         task.run();
 
-        final ZipInputStream zis = new ZipInputStream(new BufferedInputStream(new FileInputStream(file)));
-        final ZipEntry ze = zis.getNextEntry();
-        System.out.println(ze);
-        final DataInputStream stream = new DataInputStream(new BufferedInputStream(zis));
-
+        ZipInputStream zis = null;
+        DataInputStream stream = null;
+        try {
+            zis = new ZipInputStream(new BufferedInputStream(new FileInputStream(file)));
+            final ZipEntry ze = zis.getNextEntry();
+            System.out.println(ze);
+            stream = new DataInputStream(new BufferedInputStream(zis));
+        } finally {
+            if (stream != null) {
+                stream.close();
+            }
+            if (zis != null) {
+                zis.close();
+            }
+            file.delete();
+        }
     }
 
     private void store1() throws PersistitException {