| commit | e4b7e47836edf47042973e604005058c28eed23b | [log] [tgz] |
|---|---|---|
| author | Mark Payne <markap14@hotmail.com> | Wed Mar 23 12:14:35 2016 -0400 |
| committer | Mark Payne <markap14@hotmail.com> | Wed Mar 23 12:14:35 2016 -0400 |
| tree | ff6b1d9492ad7e844d76a97c0299a6b1df7b618e | |
| parent | f7ecb47e29f92e4c7790358cb6205c6c13606141 [diff] | |
| parent | b95a82f4a516249f240075e3c402655be70106ca [diff] |
Merge branch 'NIFI-1676'
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 3fa85e9..8ac82a0 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
@@ -1117,8 +1117,9 @@ @Override public void verifyCanStart(final Set<ControllerServiceNode> ignoredReferences) { - if (this.getScheduledState() == ScheduledState.RUNNING) { - throw new IllegalStateException(this + " cannot be started because it is already running"); + final ScheduledState currentState = getPhysicalScheduledState(); + if (currentState != ScheduledState.STOPPED && currentState != ScheduledState.DISABLED) { + throw new IllegalStateException(this + " cannot be started because it is not stopped. Current state is " + currentState.name()); } verifyNoActiveThreads();