Apache/nifi
1
0
Fork 0
mirror of https://github.com/apache/nifi.git synced 2025-02-07 18:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

NIFI-9389 - NPE guard for ExecuteProcess on no OnTriggered

Browse Source 
NIFI-9389 - NPE guard for ExecuteProcess on no OnTriggered
This commit is contained in:
Paul Grey 2021-11-19 14:34:57 -05:00 committed by Joe Witt
parent 87ef4deb9c
commit bb0696645e
No known key found for this signature in database
GPG Key ID: 9093BF854F811A1A
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
View File

@ -187,7 +187,7 @@ public class StandardProcessorTestRunner implements TestRunner {
@Override @Override
public void run(final int iterations, final boolean stopOnFinish, final boolean initialize, final long runWait) { public void run(final int iterations, final boolean stopOnFinish, final boolean initialize, final long runWait) {
if (iterations < 1) { if (iterations < 0) {
throw new IllegalArgumentException(); throw new IllegalArgumentException();
} }

2
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteProcess.java
View File

@ -207,7 +207,7 @@ public class ExecuteProcess extends AbstractProcessor {
try { try {
executor.shutdown(); executor.shutdown();
} finally { } finally {
if (this.externalProcess.isAlive()) { if ((this.externalProcess != null) && (this.externalProcess.isAlive())) {
this.getLogger().info("Process hasn't terminated, forcing the interrupt"); this.getLogger().info("Process hasn't terminated, forcing the interrupt");
this.externalProcess.destroyForcibly(); this.externalProcess.destroyForcibly();
} }

11
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteProcess.java
View File

@ -313,4 +313,15 @@ public class TestExecuteProcess {
.anyMatch(m -> m.getMsg().contains("Failed to create process due to"))); .anyMatch(m -> m.getMsg().contains("Failed to create process due to")));
} }
/**
* On configuration of this processor to run only on primary cluster node, other nodes call
* {@link org.apache.nifi.annotation.lifecycle.OnUnscheduled} method after an invocation (Start/Stop or RunOnce),
* causing an NPE. NPE guard added; test for this situation.
*/
@Test
public void testProcessorNotScheduled() {
final TestRunner runner = TestRunners.newTestRunner(ExecuteProcess.class);
runner.setProperty(ExecuteProcess.COMMAND, "ls");
runner.run(0);
}
} }