You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by jo...@apache.org on 2018/07/27 12:53:12 UTC
commons-io git commit: PR: IO-582
Repository: commons-io
Updated Branches:
refs/heads/master 078af456f -> 7b813b674
PR: IO-582
Make methods in ObservableInputStream.Obsever public.
Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/7b813b67
Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/7b813b67
Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/7b813b67
Branch: refs/heads/master
Commit: 7b813b674adc6c94a6c9a19524913c07b7d8bc9c
Parents: 078af45
Author: Jochen Wiedmann (jwi) <jo...@softwareag.com>
Authored: Fri Jul 27 14:53:07 2018 +0200
Committer: Jochen Wiedmann (jwi) <jo...@softwareag.com>
Committed: Fri Jul 27 14:53:07 2018 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 3 +++
.../io/input/MessageDigestCalculatingInputStream.java | 2 ++
.../apache/commons/io/input/ObservableInputStream.java | 10 +++++-----
.../commons/io/input/ObservableInputStreamTest.java | 4 ++++
4 files changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-io/blob/7b813b67/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 22b8be9..9a140c0 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -47,6 +47,9 @@ The <action> type attribute can be add,update,fix,remove.
<body>
<!-- The release date is the date RC is cut -->
<release version="2.7" date="tba" description="tba">
+ <action issue="IO-582" dev="jochen" type="fix" due-to="Bruno Palos">
+ Make methods in ObservableInputStream.Obsever public.
+ </action>
<action issue="IO-535" dev="pschumacher" type="fix" due-to="Svetlin Zarev, Anthony Raymond">
Thread bug in FileAlterationMonitor#stop(int)
</action>
http://git-wip-us.apache.org/repos/asf/commons-io/blob/7b813b67/src/main/java/org/apache/commons/io/input/MessageDigestCalculatingInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/io/input/MessageDigestCalculatingInputStream.java b/src/main/java/org/apache/commons/io/input/MessageDigestCalculatingInputStream.java
index d24e828..257adce 100644
--- a/src/main/java/org/apache/commons/io/input/MessageDigestCalculatingInputStream.java
+++ b/src/main/java/org/apache/commons/io/input/MessageDigestCalculatingInputStream.java
@@ -46,11 +46,13 @@ public class MessageDigestCalculatingInputStream extends ObservableInputStream {
}
@Override
+ public
void data(final int pByte) throws IOException {
md.update((byte) pByte);
}
@Override
+ public
void data(final byte[] pBuffer, final int pOffset, final int pLength) throws IOException {
md.update(pBuffer, pOffset, pLength);
}
http://git-wip-us.apache.org/repos/asf/commons-io/blob/7b813b67/src/main/java/org/apache/commons/io/input/ObservableInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/io/input/ObservableInputStream.java b/src/main/java/org/apache/commons/io/input/ObservableInputStream.java
index 03e8292..9c12c4b 100644
--- a/src/main/java/org/apache/commons/io/input/ObservableInputStream.java
+++ b/src/main/java/org/apache/commons/io/input/ObservableInputStream.java
@@ -44,7 +44,7 @@ public class ObservableInputStream extends ProxyInputStream {
* because, in that case, {@link #finished()} will be invoked instead.
* @throws IOException if an i/o-error occurs
*/
- void data(final int pByte) throws IOException {}
+ public void data(final int pByte) throws IOException {}
/** Called to indicate, that {@link InputStream#read(byte[])}, or
* {@link InputStream#read(byte[], int, int)} have been called, and are about to
@@ -55,7 +55,7 @@ public class ObservableInputStream extends ProxyInputStream {
* @param pLength The number of bytes, which have been stored in the byte array.
* @throws IOException if an i/o-error occurs
*/
- void data(final byte[] pBuffer, final int pOffset, final int pLength) throws IOException {}
+ public void data(final byte[] pBuffer, final int pOffset, final int pLength) throws IOException {}
/** Called to indicate, that EOF has been seen on the underlying stream.
* This method may be called multiple times, if the reader keeps invoking
@@ -63,18 +63,18 @@ public class ObservableInputStream extends ProxyInputStream {
* EOF.
* @throws IOException if an i/o-error occurs
*/
- void finished() throws IOException {}
+ public void finished() throws IOException {}
/** Called to indicate, that the {@link ObservableInputStream} has been closed.
* @throws IOException if an i/o-error occurs
*/
- void closed() throws IOException {}
+ public void closed() throws IOException {}
/**
* Called to indicate, that an error occurred on the underlying stream.
* @throws IOException if an i/o-error occurs
*/
- void error(final IOException pException) throws IOException { throw pException; }
+ public void error(final IOException pException) throws IOException { throw pException; }
}
private final List<Observer> observers = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/commons-io/blob/7b813b67/src/test/java/org/apache/commons/io/input/ObservableInputStreamTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/io/input/ObservableInputStreamTest.java b/src/test/java/org/apache/commons/io/input/ObservableInputStreamTest.java
index 007ca99..7827bea 100644
--- a/src/test/java/org/apache/commons/io/input/ObservableInputStreamTest.java
+++ b/src/test/java/org/apache/commons/io/input/ObservableInputStreamTest.java
@@ -33,18 +33,21 @@ public class ObservableInputStreamTest {
private boolean closed;
@Override
+ public
void data(final int pByte) throws IOException {
super.data(pByte);
lastByteSeen = pByte;
}
@Override
+ public
void finished() throws IOException {
super.finished();
finished = true;
}
@Override
+ public
void closed() throws IOException {
super.closed();
closed = true;
@@ -56,6 +59,7 @@ public class ObservableInputStreamTest {
private int length = -1;
@Override
+ public
void data(final byte[] pBuffer, final int pOffset, final int pLength) throws IOException {
super.data(pBuffer, pOffset, pLength);
buffer = pBuffer;