Repository: nifi Updated Branches: refs/heads/support/nifi-0.5.x 5da9f985b -> 054707c49
NIFI-1546: - Ensuring that the data reference query is not null before attempt to extract a cluster node id from it. Signed-off-by: joewitt <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/054707c4 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/054707c4 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/054707c4 Branch: refs/heads/support/nifi-0.5.x Commit: 054707c493292158b274778b75339862d6fe9728 Parents: 5da9f98 Author: Matt Gilman <[email protected]> Authored: Mon Feb 22 09:32:12 2016 -0500 Committer: joewitt <[email protected]> Committed: Mon Feb 22 12:58:47 2016 -0500 ---------------------------------------------------------------------- .../org/apache/nifi/web/ContentViewerController.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/054707c4/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/java/org/apache/nifi/web/ContentViewerController.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/java/org/apache/nifi/web/ContentViewerController.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/java/org/apache/nifi/web/ContentViewerController.java index 9b053f0..efc5db8 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/java/org/apache/nifi/web/ContentViewerController.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/java/org/apache/nifi/web/ContentViewerController.java @@ -293,12 +293,15 @@ public class ContentViewerController extends HttpServlet { final URI refUri = URI.create(ref); final String query = refUri.getQuery(); - final String[] queryParameters = query.split("&"); String rawClusterNodeId = null; - for (int i = 0; i < queryParameters.length; i++) { - if (queryParameters[0].startsWith("clusterNodeId=")) { - rawClusterNodeId = StringUtils.substringAfterLast(queryParameters[0], "clusterNodeId="); + if (query != null) { + final String[] queryParameters = query.split("&"); + + for (int i = 0; i < queryParameters.length; i++) { + if (queryParameters[0].startsWith("clusterNodeId=")) { + rawClusterNodeId = StringUtils.substringAfterLast(queryParameters[0], "clusterNodeId="); + } } } final String clusterNodeId = rawClusterNodeId;
