svn commit: r1808124 - /jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/DataStoreTestBase.java

[adulceanu]

Author: adulceanu
Date: Tue Sep 12 14:29:53 2017
New Revision: 1808124

URL: http://svn.apache.org/viewvc?rev=1808124&view=rev
Log:
OAK-6641 - test failure in 
org.apache.jackrabbit.oak.segment.standby.ExternalPrivateStoreIT
Closed all InputStreams left open

Modified:
    
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/DataStoreTestBase.java

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/DataStoreTestBase.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/DataStoreTestBase.java?rev=1808124&r1=1808123&r2=1808124&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/DataStoreTestBase.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/DataStoreTestBase.java
 Tue Sep 12 14:29:53 2017
@@ -152,8 +152,12 @@ public abstract class DataStoreTestBase
         Blob b = ps.getValue(Type.BINARY);
         assertEquals(blobSize, b.length());
         byte[] testData = new byte[blobSize];
-        ByteStreams.readFully(b.getNewStream(), testData);
-        assertArrayEquals(data, testData);
+        try (
+                InputStream blobInputStream = b.getNewStream()
+        ) {
+            ByteStreams.readFully(blobInputStream, testData);
+            assertArrayEquals(data, testData);
+        }
     }
 
     /*
@@ -190,7 +194,12 @@ public abstract class DataStoreTestBase
         Blob b = ps.getValue(Type.BINARY);
         assertEquals(blobSize, b.length());
         
-        assertTrue(IOUtils.contentEquals(newRandomInputStream(blobSize, seed), 
b.getNewStream()));
+        try (
+                InputStream randomInputStream = newRandomInputStream(blobSize, 
seed);
+                InputStream blobInputStream = b.getNewStream()
+        ) {
+            assertTrue(IOUtils.contentEquals(randomInputStream, 
blobInputStream));
+        }
     }
     
     /*
@@ -302,7 +311,11 @@ public abstract class DataStoreTestBase
         Blob b = ps.getValue(Type.BINARY);
         assertEquals(blobSize, b.length());
         byte[] testData = new byte[blobSize];
-        ByteStreams.readFully(b.getNewStream(), testData);
-        assertArrayEquals(data, testData);
+        try (
+                InputStream blobInputStream = b.getNewStream()
+        ) {
+            ByteStreams.readFully(blobInputStream, testData);
+            assertArrayEquals(data, testData);
+        }
     }
 }