Repository: nifi Updated Branches: refs/heads/master 957c12034 -> 7879a9920
NIFI-2675 fixed NPE in template generation This closes #951. Signed-off-by: Andy LoPresto <alopre...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/7879a992 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/7879a992 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/7879a992 Branch: refs/heads/master Commit: 7879a9920635c36f626ab5070041a8c795e8b65d Parents: 957c120 Author: Oleg Zhurakousky <o...@suitcase.io> Authored: Thu Aug 25 17:41:44 2016 -0400 Committer: Andy LoPresto <alopre...@apache.org> Committed: Thu Aug 25 16:44:02 2016 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/nifi/web/api/dto/FlowSnippetDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/7879a992/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowSnippetDTO.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowSnippetDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowSnippetDTO.java index 0ba10a1..536c412 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowSnippetDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowSnippetDTO.java @@ -214,7 +214,7 @@ public class FlowSnippetDTO { Map<String, PropertyDescriptorDTO> map = csDTO.getDescriptors(); Map<String, String> props = csDTO.getProperties(); for (Entry<String, PropertyDescriptorDTO> entry : map.entrySet()) { - if (entry.getValue().getIdentifiesControllerService() != null) { + if (entry.getValue().getIdentifiesControllerService() != null && props.get(entry.getKey()) != null) { String key = entry.getKey(); String value = props.get(key); id = UUID.fromString(value);
