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:47 UTC
[23/30] nifi git commit: NIFI-730: do not interrupt swap thread if
drop flowfiles is canceled
NIFI-730: do not interrupt swap thread if drop flowfiles is canceled
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/2b4999c0
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/2b4999c0
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/2b4999c0
Branch: refs/heads/master
Commit: 2b4999c0185ad6009dda33badfef3ade6cb2fde6
Parents: b8dbd10
Author: Mark Payne <ma...@hotmail.com>
Authored: Fri Oct 16 09:06:13 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Fri Oct 16 09:06:13 2015 -0400
----------------------------------------------------------------------
.../org/apache/nifi/controller/DropFlowFileRequest.java | 9 ---------
.../org/apache/nifi/controller/StandardFlowFileQueue.java | 1 -
2 files changed, 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/2b4999c0/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/DropFlowFileRequest.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/DropFlowFileRequest.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/DropFlowFileRequest.java
index 7eea86a..6f55e79 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/DropFlowFileRequest.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/DropFlowFileRequest.java
@@ -29,7 +29,6 @@ public class DropFlowFileRequest implements DropFlowFileStatus {
private volatile QueueSize currentSize;
private volatile QueueSize droppedSize = new QueueSize(0, 0L);
private volatile long lastUpdated = System.currentTimeMillis();
- private volatile Thread executionThread;
private volatile String failureReason;
private DropFlowFileState state = DropFlowFileState.WAITING_FOR_LOCK;
@@ -101,20 +100,12 @@ public class DropFlowFileRequest implements DropFlowFileStatus {
this.lastUpdated = System.currentTimeMillis();
}
- void setExecutionThread(final Thread thread) {
- this.executionThread = thread;
- }
-
synchronized boolean cancel() {
if (this.state == DropFlowFileState.COMPLETE || this.state == DropFlowFileState.CANCELED) {
return false;
}
this.state = DropFlowFileState.CANCELED;
- if (executionThread != null) {
- executionThread.interrupt();
- }
-
return true;
}
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/2b4999c0/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 a9e80b0..ddb8225 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
@@ -1051,7 +1051,6 @@ public final class StandardFlowFileQueue implements FlowFileQueue {
t.setDaemon(true);
t.start();
- dropRequest.setExecutionThread(t);
dropRequestMap.put(requestIdentifier, dropRequest);
return dropRequest;