NIFI-3130: - Loading the temporary instance from the correct type of component.
This closes #1285. Signed-off-by: Bryan Bende <bbe...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/0d044dcf Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/0d044dcf Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/0d044dcf Branch: refs/heads/support/nifi-1.1.x Commit: 0d044dcff0df2b4c41e4ef402392b3c6258c21a5 Parents: 10f6810 Author: Matt Gilman <matt.c.gil...@gmail.com> Authored: Wed Nov 30 13:24:31 2016 -0500 Committer: Matt Gilman <matt.c.gil...@gmail.com> Committed: Thu Dec 15 14:07:32 2016 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/nifi/web/api/ControllerResource.java | 4 ++-- .../main/java/org/apache/nifi/web/api/ProcessGroupResource.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/0d044dcf/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java index 8f33ba6..9d08e22 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java @@ -283,7 +283,7 @@ public class ControllerResource extends ApplicationResource { lookup -> { authorizeController(RequestAction.WRITE); - final ConfigurableComponentAuthorizable authorizable = lookup.getProcessorByType(requestReportingTask.getType()); + final ConfigurableComponentAuthorizable authorizable = lookup.getReportingTaskByType(requestReportingTask.getType()); if (authorizable.isRestricted()) { lookup.getRestrictedComponents().authorize(authorizer, RequestAction.WRITE, NiFiUserUtils.getNiFiUser()); } @@ -380,7 +380,7 @@ public class ControllerResource extends ApplicationResource { lookup -> { authorizeController(RequestAction.WRITE); - final ConfigurableComponentAuthorizable authorizable = lookup.getProcessorByType(requestControllerService.getType()); + final ConfigurableComponentAuthorizable authorizable = lookup.getControllerServiceByType(requestControllerService.getType()); if (authorizable.isRestricted()) { lookup.getRestrictedComponents().authorize(authorizer, RequestAction.WRITE, NiFiUserUtils.getNiFiUser()); } http://git-wip-us.apache.org/repos/asf/nifi/blob/0d044dcf/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java index dbe12db..17c65cf 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java @@ -2135,7 +2135,7 @@ public class ProcessGroupResource extends ApplicationResource { final Authorizable processGroup = lookup.getProcessGroup(groupId).getAuthorizable(); processGroup.authorize(authorizer, RequestAction.WRITE, user); - final ConfigurableComponentAuthorizable authorizable = lookup.getProcessorByType(requestControllerService.getType()); + final ConfigurableComponentAuthorizable authorizable = lookup.getControllerServiceByType(requestControllerService.getType()); if (authorizable.isRestricted()) { lookup.getRestrictedComponents().authorize(authorizer, RequestAction.WRITE, user); }