You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2018/02/16 14:30:59 UTC

nifi git commit: NIFI-4884 Fixing ordering during import from registry so that we set schedule strategy on a processor before setting scheduling duration. This closes #2472

Repository: nifi
Updated Branches:
  refs/heads/master 143d7e682 -> b855d0aca


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/b855d0ac
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/b855d0ac
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/b855d0ac

Branch: refs/heads/master
Commit: b855d0acaef7aa399469529b3133a7027bbb2f24
Parents: 143d7e6
Author: Bryan Bende <bb...@apache.org>
Authored: Thu Feb 15 12:42:47 2018 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Fri Feb 16 09:27:36 2018 -0500

----------------------------------------------------------------------
 .../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/b855d0ac/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 ae9b43f..c738737 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()));