You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by al...@apache.org on 2015/11/18 17:27:23 UTC

nifi git commit: NIFI-1173: Even if FlowFile Queue is empty, it needs to hold onto the Empty Queue request so that subsequent cancel/clear requests can reference it

Repository: nifi
Updated Branches:
  refs/heads/master 180ea1ba2 -> d88b6cb6b


NIFI-1173: Even if FlowFile Queue is empty, it needs to hold onto the Empty Queue request so that subsequent cancel/clear requests can reference it

Signed-off-by: Aldrin Piri <al...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/d88b6cb6
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/d88b6cb6
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/d88b6cb6

Branch: refs/heads/master
Commit: d88b6cb6bca01507103c565d2489dd83ebae5e17
Parents: 180ea1b
Author: Mark Payne <ma...@hotmail.com>
Authored: Mon Nov 16 16:26:14 2015 -0500
Committer: Aldrin Piri <al...@apache.org>
Committed: Wed Nov 18 10:56:38 2015 -0500

----------------------------------------------------------------------
 .../main/java/org/apache/nifi/controller/StandardFlowFileQueue.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/d88b6cb6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowFileQueue.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowFileQueue.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowFileQueue.java
index 9a439c9..c6fbf28 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowFileQueue.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowFileQueue.java
@@ -862,6 +862,7 @@ public final class StandardFlowFileQueue implements FlowFileQueue {
         if (originalSize.getObjectCount() == 0) {
             dropRequest.setDroppedSize(originalSize);
             dropRequest.setState(DropFlowFileState.COMPLETE);
+            dropRequestMap.put(requestIdentifier, dropRequest);
             return dropRequest;
         }