From 07a6499dae93344b0e8a8e8cd890ba16cf667fe2 Mon Sep 17 00:00:00 2001 From: m-hogue Date: Fri, 7 Jul 2017 06:46:02 -0400 Subject: [PATCH] NIFI-3218: fixed incorrect assertion for self-routing flowfiles in MockProcessSession Signed-off-by: Joe Skora This closes #1988. --- .../main/java/org/apache/nifi/util/MockProcessSession.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessSession.java b/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessSession.java index 553c6e4e0a..2fdc6eac76 100644 --- a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessSession.java +++ b/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessSession.java @@ -756,10 +756,10 @@ public class MockProcessSession implements ProcessSession { throw new IllegalArgumentException("I only accept MockFlowFile"); } - // if the flowfile provided was created in this session (i.e. it's in currentVersions), + // if the flowfile provided was created in this session (i.e. it's in currentVersions and not in original versions), // then throw an exception indicating that you can't transfer flowfiles back to self. - // this mimics the behavior of StandardProcessSession - if(currentVersions.get(flowFile.getId()) != null) { + // this mimics the same behavior in StandardProcessSession + if(currentVersions.get(flowFile.getId()) != null && originalVersions.get(flowFile.getId()) == null) { throw new IllegalArgumentException("Cannot transfer FlowFiles that are created in this Session back to self"); }