From 6518778c1158e52461d832ab18c44d1a5ed5cefb Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Sun, 29 Jan 2017 09:17:35 -0500 Subject: [PATCH] NIFI-3180 Fixed NPE in TemplateUtils added null check for ProcessorDTO.getRelationship() removed deprecated usage of ByteArrayInputStream This closes #1451. --- .../java/org/apache/nifi/controller/TemplateUtils.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/TemplateUtils.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/TemplateUtils.java index 759edb57fe..24abd5f76c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/TemplateUtils.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/TemplateUtils.java @@ -17,6 +17,7 @@ package org.apache.nifi.controller; +import java.io.ByteArrayInputStream; import java.io.DataInputStream; import java.io.IOException; import java.io.InputStream; @@ -31,7 +32,6 @@ import javax.xml.bind.Unmarshaller; import javax.xml.transform.dom.DOMSource; import org.apache.nifi.persistence.TemplateDeserializer; -import org.apache.nifi.stream.io.ByteArrayInputStream; import org.apache.nifi.stream.io.StreamUtils; import org.apache.nifi.web.api.dto.ConnectableDTO; import org.apache.nifi.web.api.dto.ConnectionDTO; @@ -193,8 +193,10 @@ public class TemplateUtils { processorConfig.setAutoTerminatedRelationships(null); } - for (final RelationshipDTO relationship : processorDTO.getRelationships()) { - relationship.setDescription(null); + if (processorDTO.getRelationships() != null) { + for (final RelationshipDTO relationship : processorDTO.getRelationships()) { + relationship.setDescription(null); + } } processorDTO.setValidationErrors(null);