You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/11/02 20:32:44 UTC
[20/30] nifi git commit: NIFI-730: reordered states for drop flowfile
request
NIFI-730: reordered states for drop flowfile request
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/09a3f6da
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/09a3f6da
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/09a3f6da
Branch: refs/heads/master
Commit: 09a3f6dadd5ccff75590c53d071cc4ebe6c6175b
Parents: 98a04ee
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Oct 14 16:32:39 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Wed Oct 14 16:32:39 2015 -0400
----------------------------------------------------------------------
.../org/apache/nifi/controller/queue/DropFlowFileState.java | 6 +++---
.../java/org/apache/nifi/controller/StandardFlowFileQueue.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/09a3f6da/nifi-api/src/main/java/org/apache/nifi/controller/queue/DropFlowFileState.java
----------------------------------------------------------------------
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/queue/DropFlowFileState.java b/nifi-api/src/main/java/org/apache/nifi/controller/queue/DropFlowFileState.java
index 6462dfd..12dbedf 100644
--- a/nifi-api/src/main/java/org/apache/nifi/controller/queue/DropFlowFileState.java
+++ b/nifi-api/src/main/java/org/apache/nifi/controller/queue/DropFlowFileState.java
@@ -23,10 +23,10 @@ package org.apache.nifi.controller.queue;
public enum DropFlowFileState {
WAITING_FOR_LOCK("Waiting for Destination Component to complete its action"),
- DROPPING_ACTIVE_FLOWFILES("Dropping FlowFiles from queue"),
- COMPLETE("Completed Successfully"),
+ DROPPING_FLOWFILES("Dropping FlowFiles from queue"),
FAILURE("Failed"),
- CANCELED("Cancelled by User");
+ CANCELED("Canceled by User"),
+ COMPLETE("Completed Successfully");
private final String description;
http://git-wip-us.apache.org/repos/asf/nifi/blob/09a3f6da/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 b0c31e7..6e42f55 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
@@ -944,7 +944,7 @@ public final class StandardFlowFileQueue implements FlowFileQueue {
public void run() {
writeLock.lock();
try {
- dropRequest.setState(DropFlowFileState.DROPPING_ACTIVE_FLOWFILES);
+ dropRequest.setState(DropFlowFileState.DROPPING_FLOWFILES);
logger.debug("For DropFlowFileRequest {}, original size is {}", requestIdentifier, getQueueSize());
dropRequest.setOriginalSize(getQueueSize());