From 09a3f6dadd5ccff75590c53d071cc4ebe6c6175b Mon Sep 17 00:00:00 2001 From: Mark Payne Date: Wed, 14 Oct 2015 16:32:39 -0400 Subject: [PATCH] NIFI-730: reordered states for drop flowfile request --- .../org/apache/nifi/controller/queue/DropFlowFileState.java | 6 +++--- .../org/apache/nifi/controller/StandardFlowFileQueue.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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 6462dfd715..12dbedfc1d 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; 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 b0c31e7462..6e42f55cf0 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());