From 16c9bd535bebb1438f28c4ed1ec30f02cc994c60 Mon Sep 17 00:00:00 2001 From: Mark Payne Date: Fri, 25 Mar 2022 14:10:21 -0400 Subject: [PATCH] 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 --- .../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]); }