You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2014/03/28 00:50:08 UTC

svn commit: r1582550 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/solrj/ solr/solrj/src/test/org/apache/solr/common/util/ContentStreamTest.java

Author: uschindler
Date: Thu Mar 27 23:50:07 2014
New Revision: 1582550

URL: http://svn.apache.org/r1582550
Log:
Merged revision(s) 1582549 from lucene/dev/trunk:
SOLR-5914: Fix missing close on Reader

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/solrj/   (props changed)
    lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/common/util/ContentStreamTest.java

Modified: lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/common/util/ContentStreamTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/common/util/ContentStreamTest.java?rev=1582550&r1=1582549&r2=1582550&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/common/util/ContentStreamTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/common/util/ContentStreamTest.java Thu Mar 27 23:50:07 2014
@@ -58,12 +58,14 @@ public class ContentStreamTest extends S
     FileInputStream fis = new FileInputStream(file);
     InputStreamReader isr = new InputStreamReader(
         new FileInputStream(file), "UTF-8");
+    Reader r = stream.getReader();
     try {
       assertEquals(file.length(), stream.getSize().intValue());
       assertTrue(IOUtils.contentEquals(fis, s));
-      assertTrue(IOUtils.contentEquals(isr, stream.getReader()));
+      assertTrue(IOUtils.contentEquals(isr, r));
     } finally {
       s.close();
+      r.close();
       isr.close();
       fis.close();
     }