You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2020/05/04 15:15:20 UTC
[commons-io] branch master updated: Resue
org.apache.commons.io.input.ClosedInputStream.CLOSED_INPUT_STREAM.
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-io.git
The following commit(s) were added to refs/heads/master by this push:
new c382f5d Resue org.apache.commons.io.input.ClosedInputStream.CLOSED_INPUT_STREAM.
c382f5d is described below
commit c382f5d17a4989ff32bb799d868c0110a780f9aa
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon May 4 11:15:15 2020 -0400
Resue org.apache.commons.io.input.ClosedInputStream.CLOSED_INPUT_STREAM.
---
src/main/java/org/apache/commons/io/input/AutoCloseInputStream.java | 2 +-
.../org/apache/commons/io/output/AbstractByteArrayOutputStream.java | 2 +-
src/test/java/org/apache/commons/io/input/TaggedInputStreamTest.java | 5 ++---
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/commons/io/input/AutoCloseInputStream.java b/src/main/java/org/apache/commons/io/input/AutoCloseInputStream.java
index e946b54..477dbf2 100644
--- a/src/main/java/org/apache/commons/io/input/AutoCloseInputStream.java
+++ b/src/main/java/org/apache/commons/io/input/AutoCloseInputStream.java
@@ -62,7 +62,7 @@ public class AutoCloseInputStream extends ProxyInputStream {
@Override
public void close() throws IOException {
in.close();
- in = new ClosedInputStream();
+ in = ClosedInputStream.CLOSED_INPUT_STREAM;
}
/**
diff --git a/src/main/java/org/apache/commons/io/output/AbstractByteArrayOutputStream.java b/src/main/java/org/apache/commons/io/output/AbstractByteArrayOutputStream.java
index cf2114b..d350149 100644
--- a/src/main/java/org/apache/commons/io/output/AbstractByteArrayOutputStream.java
+++ b/src/main/java/org/apache/commons/io/output/AbstractByteArrayOutputStream.java
@@ -307,7 +307,7 @@ public abstract class AbstractByteArrayOutputStream extends OutputStream {
final InputStreamConstructor<T> isConstructor) {
int remaining = count;
if (remaining == 0) {
- return new ClosedInputStream();
+ return ClosedInputStream.CLOSED_INPUT_STREAM;
}
final List<T> list = new ArrayList<>(buffers.size());
for (final byte[] buf : buffers) {
diff --git a/src/test/java/org/apache/commons/io/input/TaggedInputStreamTest.java b/src/test/java/org/apache/commons/io/input/TaggedInputStreamTest.java
index 6e72b5b..91f05fe 100644
--- a/src/test/java/org/apache/commons/io/input/TaggedInputStreamTest.java
+++ b/src/test/java/org/apache/commons/io/input/TaggedInputStreamTest.java
@@ -36,7 +36,7 @@ public class TaggedInputStreamTest {
@Test
public void testEmptyStream() throws IOException {
- final InputStream stream = new TaggedInputStream(new ClosedInputStream());
+ final InputStream stream = new TaggedInputStream(ClosedInputStream.CLOSED_INPUT_STREAM);
assertEquals(0, stream.available());
assertEquals(-1, stream.read());
assertEquals(-1, stream.read(new byte[1]));
@@ -111,8 +111,7 @@ public class TaggedInputStreamTest {
@Test
public void testOtherException() throws Exception {
final IOException exception = new IOException("test exception");
- final InputStream closed = new ClosedInputStream();
- final TaggedInputStream stream = new TaggedInputStream(closed);
+ final TaggedInputStream stream = new TaggedInputStream(ClosedInputStream.CLOSED_INPUT_STREAM);
assertFalse(stream.isCauseOf(exception));
assertFalse(stream.isCauseOf(