You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/01/29 15:06:08 UTC
[3/4] incubator-nifi git commit: NIFI-250: Fixed bug where validator
returns controller service identifier instead of name in description. Fixed
bug where controller serivce references are not updated when property is
removed from processor/service/repor
NIFI-250: Fixed bug where validator returns controller service identifier instead of name in description. Fixed bug where controller serivce references are not updated when property is removed from processor/service/reporting task
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/f18aca1e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/f18aca1e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/f18aca1e
Branch: refs/heads/NIFI-250
Commit: f18aca1e0a6a701b9390cbe80e131296fbcbc7e7
Parents: 31caadb
Author: Mark Payne <ma...@hotmail.com>
Authored: Thu Jan 29 09:05:43 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Thu Jan 29 09:05:43 2015 -0500
----------------------------------------------------------------------
.../org/apache/nifi/components/PropertyDescriptor.java | 2 +-
.../nifi/controller/AbstractConfiguredComponent.java | 10 ++++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f18aca1e/nifi/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java b/nifi/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
index ba0f7dc..a4c855b 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
@@ -144,7 +144,7 @@ public final class PropertyDescriptor implements Comparable<PropertyDescriptor>
final ControllerService controllerService = context.getControllerServiceLookup().getControllerService(input);
if (!context.getControllerServiceLookup().isControllerServiceEnabled(controllerService)) {
return new ValidationResult.Builder()
- .input(input)
+ .input(context.getControllerServiceLookup().getControllerServiceName(controllerService.getIdentifier()))
.subject(getName())
.valid(false)
.explanation("Controller Service " + controllerService + " is disabled")
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f18aca1e/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractConfiguredComponent.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractConfiguredComponent.java
index ef4b72a..af65b41 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractConfiguredComponent.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractConfiguredComponent.java
@@ -149,6 +149,16 @@ public abstract class AbstractConfiguredComponent implements ConfigurableCompone
final PropertyDescriptor descriptor = component.getPropertyDescriptor(name);
String value = null;
if (!descriptor.isRequired() && (value = properties.remove(descriptor)) != null) {
+
+ if ( descriptor.getControllerServiceDefinition() != null ) {
+ if (value != null) {
+ final ControllerServiceNode oldNode = serviceProvider.getControllerServiceNode(value);
+ if (oldNode != null) {
+ oldNode.removeReference(this);
+ }
+ }
+ }
+
component.onPropertyModified(descriptor, value, null);
return true;
}