Repository: nifi Updated Branches: refs/heads/master 3a153d3a4 -> cddbe7d41
NIFI-2388 This closes #728. Use null for group id if no group specified instead of throwing NPE Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/cddbe7d4 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/cddbe7d4 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/cddbe7d4 Branch: refs/heads/master Commit: cddbe7d41f52c28606a0c125f6916b2e96d93232 Parents: 3a153d3 Author: Mark Payne <[email protected]> Authored: Tue Jul 26 11:37:31 2016 -0400 Committer: joewitt <[email protected]> Committed: Fri Jul 29 09:14:50 2016 -0400 ---------------------------------------------------------------------- .../org/apache/nifi/processor/StandardValidationContext.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/cddbe7d4/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/StandardValidationContext.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/StandardValidationContext.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/StandardValidationContext.java index 3fb8a21..7282ee9 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/StandardValidationContext.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/StandardValidationContext.java @@ -35,6 +35,7 @@ import org.apache.nifi.controller.ControllerServiceLookup; import org.apache.nifi.controller.service.ControllerServiceNode; import org.apache.nifi.controller.service.ControllerServiceProvider; import org.apache.nifi.expression.ExpressionLanguageCompiler; +import org.apache.nifi.groups.ProcessGroup; public class StandardValidationContext implements ValidationContext { @@ -97,8 +98,9 @@ public class StandardValidationContext implements ValidationContext { @Override public ValidationContext getControllerServiceValidationContext(final ControllerService controllerService) { final ControllerServiceNode serviceNode = controllerServiceProvider.getControllerServiceNode(controllerService.getIdentifier()); - return new StandardValidationContext(controllerServiceProvider, serviceNode.getProperties(), serviceNode.getAnnotationData(), - serviceNode.getProcessGroup().getIdentifier(), serviceNode.getIdentifier()); + final ProcessGroup serviceGroup = serviceNode.getProcessGroup(); + final String serviceGroupId = serviceGroup == null ? null : serviceGroup.getIdentifier(); + return new StandardValidationContext(controllerServiceProvider, serviceNode.getProperties(), serviceNode.getAnnotationData(), serviceGroupId, serviceNode.getIdentifier()); } @Override
