Skip to content

Commit 872ed3c

Browse files
committed
MessageDigestCalculatingInputStream.MessageDigestMaintainingObserver.MessageDigestMaintainingObserver(MessageDigest)
now throws a NullPointerException if the MessageDigest is null MessageDigestCalculatingInputStream.MessageDigestCalculatingInputStream(InputStream, MessageDigest) now throws a NullPointerException if the MessageDigest is null
1 parent 5c0703a commit 872ed3c

2 files changed

Lines changed: 12 additions & 1 deletion

File tree

src/changes/changes.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,14 @@ The <action> type attribute can be add,update,fix,remove.
9797
<action dev="ggregory" type="fix" due-to="Gary Gregory">
9898
Fix CodeQL warnings in UnsynchronizedBufferedInputStream: Implicit narrowing conversion in compound assignment.
9999
</action>
100+
<action dev="ggregory" type="fix" due-to="Gary Gregory">
101+
MessageDigestCalculatingInputStream.MessageDigestMaintainingObserver.MessageDigestMaintainingObserver(MessageDigest) now throws a NullPointerException
102+
if the MessageDigest is null.
103+
</action>
104+
<action dev="ggregory" type="fix" due-to="Gary Gregory">
105+
MessageDigestCalculatingInputStream.MessageDigestCalculatingInputStream(InputStream, MessageDigest) now throws a NullPointerException
106+
if the MessageDigest is null.
107+
</action>
100108
<!-- ADD -->
101109
<action dev="ggregory" type="add" due-to="Gary Gregory">
102110
Add org.apache.commons.io.channels.FileChannels.

src/main/java/org/apache/commons/io/input/MessageDigestCalculatingInputStream.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.security.MessageDigest;
2222
import java.security.NoSuchAlgorithmException;
2323
import java.security.Provider;
24+
import java.util.Objects;
2425

2526
import org.apache.commons.io.build.AbstractStreamBuilder;
2627

@@ -126,9 +127,10 @@ public static class MessageDigestMaintainingObserver extends Observer {
126127
* Constructs an MessageDigestMaintainingObserver for the given MessageDigest.
127128
*
128129
* @param messageDigest the message digest to use
130+
* @throws NullPointerException if messageDigest is null.
129131
*/
130132
public MessageDigestMaintainingObserver(final MessageDigest messageDigest) {
131-
this.messageDigest = messageDigest;
133+
this.messageDigest = Objects.requireNonNull(messageDigest, "messageDigest");
132134
}
133135

134136
@Override
@@ -193,6 +195,7 @@ public MessageDigestCalculatingInputStream(final InputStream inputStream) throws
193195
*
194196
* @param inputStream the stream to calculate the message digest for
195197
* @param messageDigest the message digest to use
198+
* @throws NullPointerException if messageDigest is null.
196199
* @deprecated Use {@link #builder()}, {@link Builder}, and {@link Builder#get()}.
197200
*/
198201
@Deprecated

0 commit comments

Comments
 (0)