This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.16 in repository https://gitbox.apache.org/repos/asf/nifi.git
commit ca585899d96b765bd4281e70c468354166e680a0 Author: Mark Payne <[email protected]> AuthorDate: Fri Mar 25 14:10:21 2022 -0400 NIFI-9834: When calling ByteArrayContentRepository.read() on a null Content Claim, return an empty ByteArrayInputStream instead of throwing NullPointerException This closes #5903. Signed-off-by: Peter Turcsanyi <[email protected]> --- .../nifi/stateless/repository/ByteArrayContentRepository.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/repository/ByteArrayContentRepository.java b/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/repository/ByteArrayContentRepository.java index 39baaea2ed..e32aa738b3 100644 --- a/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/repository/ByteArrayContentRepository.java +++ b/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/repository/ByteArrayContentRepository.java @@ -215,12 +215,16 @@ public class ByteArrayContentRepository implements ContentRepository { @Override public InputStream read(final ContentClaim claim) { + if (claim == null) { + return new ByteArrayInputStream(new byte[0]); + } + final ByteArrayContentClaim byteArrayContentClaim = verifyClaim(claim); return byteArrayContentClaim.read(); } @Override - public InputStream read(final ResourceClaim claim) throws IOException { + public InputStream read(final ResourceClaim claim) { if (claim == null) { return new ByteArrayInputStream(new byte[0]); }
