Apache/nifi
1
0
Fork 0
mirror of https://github.com/apache/nifi.git synced 2025-02-09 03:25:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

NIFI-5200: Fixed issue with InputStream being closed when calling ProcessSession.read() twice against sequential Content Claims

Browse Source 
Signed-off-by: Matthew Burgess <mattyb149@apache.org>

This closes #2753
This commit is contained in:
Mark Payne 2018-06-01 11:14:56 -04:00 committed by Matthew Burgess
parent 4bccab7e05
commit 00a63d17af
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
View File

@ -2141,14 +2141,14 @@ public final class StandardProcessSession implements ProcessSession, ProvenanceE
currentReadClaim = claim;
// Use a non-closeable stream because we want to keep it open after the callback has finished so that we can
// reuse the same InputStream for the next FlowFile
final InputStream disableOnClose = new DisableOnCloseInputStream(rawInStream);
currentReadClaimStream = new ByteCountingInputStream(disableOnClose);
currentReadClaimStream = new ByteCountingInputStream(rawInStream);
StreamUtils.skip(currentReadClaimStream, offset);
return currentReadClaimStream;
// Use a non-closeable stream because we want to keep it open after the callback has finished so that we can
// reuse the same InputStream for the next FlowFile
final InputStream disableOnClose = new DisableOnCloseInputStream(currentReadClaimStream);
return disableOnClose;
} else {
claimCache.flush(claim);
final InputStream rawInStream = context.getContentRepository().read(claim);

19
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
View File

@ -349,6 +349,25 @@ public class TestStandardProcessSession {
});
}
@Test
public void testSequentialReads() throws IOException {
FlowFile ff1 = session.write(session.create(), out -> out.write(new byte[] {'A', 'B'}));
FlowFile ff2 = session.write(session.create(), out -> out.write('C'));
final byte[] buff1 = new byte[2];
try (final InputStream in = session.read(ff1)) {
StreamUtils.fillBuffer(in, buff1);
}
final byte[] buff2 = new byte[1];
try (final InputStream in = session.read(ff2)) {
StreamUtils.fillBuffer(in, buff2);
}
Assert.assertArrayEquals(new byte[] {'A', 'B'}, buff1);
Assert.assertArrayEquals(new byte[] {'C'}, buff2);
}
@Test
public void testCloneOriginalDataLarger() throws IOException {
final byte[] originalContent = "hello there 12345".getBytes();