Repository: nifi Updated Branches: refs/heads/master 6df97bbc8 -> 9e296830a
NIFI-4151: Ensure that we properly call invalidateValidationContext() when properties change; ensure that in the controller service provider we don't replace a controller service with a new node if the ID's match, as we won't be able to actually add the new one to the flow. This closes #1995 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/9e296830 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/9e296830 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/9e296830 Branch: refs/heads/master Commit: 9e296830ab813bbdecf65b57ba723ae822abeff5 Parents: 6df97bb Author: Mark Payne <[email protected]> Authored: Fri Jul 7 15:18:51 2017 -0400 Committer: Matt Gilman <[email protected]> Committed: Fri Jul 7 16:41:32 2017 -0400 ---------------------------------------------------------------------- .../apache/nifi/controller/AbstractConfiguredComponent.java | 6 +++--- .../controller/service/StandardControllerServiceProvider.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/9e296830/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractConfiguredComponent.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractConfiguredComponent.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractConfiguredComponent.java index 2aa84f8..45c6ead 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractConfiguredComponent.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractConfiguredComponent.java @@ -217,7 +217,7 @@ public abstract class AbstractConfiguredComponent implements ConfigurableCompone } try { - getComponent().onPropertyModified(descriptor, oldValue, value); + onPropertyModified(descriptor, oldValue, value); } catch (final Exception e) { // nothing really to do here... } @@ -253,7 +253,7 @@ public abstract class AbstractConfiguredComponent implements ConfigurableCompone } try { - getComponent().onPropertyModified(descriptor, value, null); + onPropertyModified(descriptor, value, null); } catch (final Exception e) { getLogger().error(e.getMessage(), e); } @@ -436,7 +436,7 @@ public abstract class AbstractConfiguredComponent implements ConfigurableCompone } @Override - public void onPropertyModified(final PropertyDescriptor descriptor, final String oldValue, final String newValue) { + public final void onPropertyModified(final PropertyDescriptor descriptor, final String oldValue, final String newValue) { invalidateValidationContext(); try (final NarCloseable narCloseable = NarCloseable.withComponentNarLoader(getComponent().getClass(), getComponent().getIdentifier())) { getComponent().onPropertyModified(descriptor, oldValue, newValue); http://git-wip-us.apache.org/repos/asf/nifi/blob/9e296830/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java index 4011113..5c4e394 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java @@ -162,7 +162,7 @@ public class StandardControllerServiceProvider implements ControllerServiceProvi } } - serviceCache.put(id, serviceNode); + serviceCache.putIfAbsent(id, serviceNode); return serviceNode; } catch (final Throwable t) {
