[commons-vfs] branch master updated: MonitorInputStream should not close the stream in "read" (#67)

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-vfs.git


The following commit(s) were added to refs/heads/master by this push:
     new f2bbd79  MonitorInputStream should not close the stream in "read" (#67)
f2bbd79 is described below

commit f2bbd79a56a347f7f65804c6cd105c669d387c92
Author: Boris Petrov <boris_pet...@live.com>
AuthorDate: Tue Jun 18 17:06:40 2019 +0300

    MonitorInputStream should not close the stream in "read" (#67)
    
    [VFS-718] MonitorInputStream should not close the stream in "read" #67.
---
 .../src/main/java/org/apache/commons/vfs2/util/MonitorInputStream.java  | 2 --
 .../java/org/apache/commons/vfs2/provider/DefaultFileContentTest.java   | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/MonitorInputStream.java
 
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/MonitorInputStream.java
index d6b1041..7de18d5 100644
--- 
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/MonitorInputStream.java
+++ 
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/MonitorInputStream.java
@@ -85,8 +85,6 @@ public class MonitorInputStream extends BufferedInputStream {
             return ch;
         }
 
-        // End-of-stream
-        close();
         return EOF_CHAR;
     }
 
diff --git 
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/DefaultFileContentTest.java
 
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/DefaultFileContentTest.java
index 084d769..2192f9e 100644
--- 
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/DefaultFileContentTest.java
+++ 
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/DefaultFileContentTest.java
@@ -49,6 +49,7 @@ public class DefaultFileContentTest {
                         stream.mark(0);
                         final byte[] data = new byte[100];
                         stream.read(data, 0, 7);
+                        stream.read();
                         Assert.assertEquals(expected, new String(data).trim());
                         stream.reset();
                     }
@@ -74,6 +75,7 @@ public class DefaultFileContentTest {
                         stream.mark(0);
                         final byte[] data = new byte[100];
                         readCount = stream.read(data, 0, 7);
+                        stream.read();
                         Assert.assertEquals(readCount, 7);
                         Assert.assertEquals(expected, new String(data).trim());
                         readCount = stream.read(data, 8, 10);