Repository: incubator-nifi Updated Branches: refs/heads/NIFI-250 3e77e7d32 -> 2da579242
NIFI-250: - Fixing NPE in stubbed out method. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/1854ebed Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/1854ebed Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/1854ebed Branch: refs/heads/NIFI-250 Commit: 1854ebed22387d0f1a82bd9c52ab1ab5ae5c7e21 Parents: 3e77e7d Author: Matt Gilman <[email protected]> Authored: Mon Jan 26 09:38:59 2015 -0500 Committer: Matt Gilman <[email protected]> Committed: Mon Jan 26 09:38:59 2015 -0500 ---------------------------------------------------------------------- .../apache/nifi/web/dao/impl/StandardControllerServiceDAO.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/1854ebed/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 ae24c87..0cdde6b 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 @@ -17,6 +17,7 @@ package org.apache.nifi.web.dao.impl; import java.util.HashMap; +import java.util.HashSet; import java.util.Map; import java.util.Set; @@ -56,8 +57,6 @@ public class StandardControllerServiceDAO extends ComponentDAO implements Contro */ @Override public ControllerServiceNode createControllerService(final ControllerServiceDTO controllerServiceDTO) { - final Map<String, String> temp = new HashMap<>(); - // create the controller service final ControllerServiceNode controllerService = flowController.createControllerService(controllerServiceDTO.getType(), controllerServiceDTO.getName(), true); return controllerService; @@ -92,7 +91,7 @@ public class StandardControllerServiceDAO extends ComponentDAO implements Contro */ @Override public Set<ControllerServiceNode> getControllerServices() { - return null; + return new HashSet<>(); } /**
