NIFI-4884 Fixing ordering during import from registry so that we set schedule strategy on a processor before setting scheduling duration. This closes #2472
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/4adb5b7f Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/4adb5b7f Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/4adb5b7f Branch: refs/heads/HDF-3.1-maint Commit: 4adb5b7f6f3d12b36acf57c5be4f7bd8ffa66cc2 Parents: a8e519b Author: Bryan Bende <[email protected]> Authored: Thu Feb 15 12:42:47 2018 -0500 Committer: Matt Gilman <[email protected]> Committed: Tue Mar 13 13:33:14 2018 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/nifi/groups/StandardProcessGroup.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/4adb5b7f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java index 9fd5ad7..4177917 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java @@ -4080,8 +4080,8 @@ public final class StandardProcessGroup implements ProcessGroup { final Map<String, String> properties = populatePropertiesMap(processor.getProperties(), proposed.getProperties(), proposed.getPropertyDescriptors(), processor.getProcessGroup()); processor.setProperties(properties, true); processor.setRunDuration(proposed.getRunDurationMillis(), TimeUnit.MILLISECONDS); - processor.setScheduldingPeriod(proposed.getSchedulingPeriod()); processor.setSchedulingStrategy(SchedulingStrategy.valueOf(proposed.getSchedulingStrategy())); + processor.setScheduldingPeriod(proposed.getSchedulingPeriod()); processor.setStyle(proposed.getStyle()); processor.setYieldPeriod(proposed.getYieldDuration()); processor.setPosition(new Position(proposed.getPosition().getX(), proposed.getPosition().getY()));
