You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2015/12/15 18:51:58 UTC
nifi git commit: NIFI-1185: - Using banners from the NCM rather than
replicating to a node.
Repository: nifi
Updated Branches:
refs/heads/master c75b5cfce -> 51b8ecd01
NIFI-1185:
- Using banners from the NCM rather than replicating to a node.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/51b8ecd0
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/51b8ecd0
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/51b8ecd0
Branch: refs/heads/master
Commit: 51b8ecd01b8d83c76e69259188df05916695771b
Parents: c75b5cf
Author: Matt Gilman <ma...@gmail.com>
Authored: Tue Dec 15 12:51:14 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Tue Dec 15 12:51:14 2015 -0500
----------------------------------------------------------------------
.../main/java/org/apache/nifi/web/api/ControllerResource.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/51b8ecd0/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 6e6739d..ef62a62 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
@@ -979,11 +979,7 @@ public class ControllerResource extends ApplicationResource {
)
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
- // replicate if cluster manager
- if (properties.isClusterManager()) {
- return clusterManager.applyRequest(HttpMethod.GET, getAbsolutePath(), getRequestParameters(true), getHeaders()).getResponse();
- }
-
+ // get the banner from the properties - will come from the NCM when clustered
final String bannerText = properties.getBannerText();
// create the DTO