Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-3180 Fixed NPE in TemplateUtils 

added null check for ProcessorDTO.getRelationship()
removed deprecated usage of ByteArrayInputStream

This closes #1451.
This commit is contained in:
Oleg Zhurakousky 2017-01-29 09:17:35 -05:00 committed by Pierre Villard
parent 910c1fa6f6
commit 6518778c11
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/TemplateUtils.java
View File

@ -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);