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/30 20:43:55 UTC
incubator-nifi git commit: NIFI-250: Updated to pass Availability
when creating controller services
Repository: incubator-nifi
Updated Branches:
refs/heads/NIFI-250 e056bb7d7 -> cc25d1d21
NIFI-250: Updated to pass Availability when creating controller services
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/cc25d1d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/cc25d1d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/cc25d1d2
Branch: refs/heads/NIFI-250
Commit: cc25d1d21cae8b30eff0db66d1ad9b6bbae5351d
Parents: e056bb7
Author: Mark Payne <ma...@hotmail.com>
Authored: Fri Jan 30 14:43:54 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Fri Jan 30 14:43:54 2015 -0500
----------------------------------------------------------------------
.../apache/nifi/web/dao/impl/StandardControllerServiceDAO.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/cc25d1d2/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardControllerServiceDAO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardControllerServiceDAO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardControllerServiceDAO.java
index 394e33d..cc1fc24 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardControllerServiceDAO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardControllerServiceDAO.java
@@ -61,7 +61,8 @@ public class StandardControllerServiceDAO extends ComponentDAO implements Contro
@Override
public ControllerServiceNode createControllerService(final ControllerServiceDTO controllerServiceDTO) {
// create the controller service
- final ControllerServiceNode controllerService = flowController.createControllerService(controllerServiceDTO.getType(), true);
+ final Availability availability = Availability.valueOf(controllerServiceDTO.getAvailability().toUpperCase());
+ final ControllerServiceNode controllerService = flowController.createControllerService(controllerServiceDTO.getType(), availability, true);
// ensure we can perform the update
verifyUpdate(controllerService, controllerServiceDTO);
@@ -223,9 +224,6 @@ public class StandardControllerServiceDAO extends ComponentDAO implements Contro
if (isNotNull(name)) {
controllerService.setName(name);
}
- if (isNotNull(availability)) {
- controllerService.setAvailability(Availability.valueOf(availability));
- }
if (isNotNull(annotationData)) {
controllerService.setAnnotationData(annotationData);
}