[nifi] branch master updated: NIFI-5944: If processor is no longer scheduled to run after a failed trigger of @OnScheduled, ensure that we set scheduled status to STOPPED

[mcgilman]

This is an automated email from the ASF dual-hosted git repository.

mcgilman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/master by this push:
     new 89adb03  NIFI-5944: If processor is no longer scheduled to run after a 
failed trigger of @OnScheduled, ensure that we set scheduled status to STOPPED
89adb03 is described below

commit 89adb039d28d119a942eab6045320d2bf26c5db2
Author: Mark Payne <marka...@hotmail.com>
AuthorDate: Thu Jan 10 16:33:55 2019 -0500

    NIFI-5944: If processor is no longer scheduled to run after a failed 
trigger of @OnScheduled, ensure that we set scheduled status to STOPPED
    
    This closes #3263
---
 .../src/main/java/org/apache/nifi/controller/StandardProcessorNode.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
index 8ca5173..a68eaab 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
@@ -1485,6 +1485,7 @@ public class StandardProcessorNode extends ProcessorNode 
implements Connectable
             if (currentScheduleState == ScheduledState.STOPPING || 
currentScheduleState == ScheduledState.STOPPED) {
                 LOG.debug("{} is stopped. Will not call @OnScheduled lifecycle 
methods or begin trigger onTrigger() method", StandardProcessorNode.this);
                 schedulingAgentCallback.onTaskComplete();
+                scheduledState.set(ScheduledState.STOPPED);
                 return null;
             }