From 4b22d8358b73126f7f062fcba3617df2198a6385 Mon Sep 17 00:00:00 2001 From: Mark Payne Date: Wed, 20 Jul 2016 11:57:41 -0400 Subject: [PATCH] NIFI-2330: Ensure that we set ProcessGroupDTO's contents after populating sets of components, as the contents dto now copies the sets --- .../serialization/FlowFromDOMFactory.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/FlowFromDOMFactory.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/FlowFromDOMFactory.java index ef910ab1f50e..1409df4b9d13 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/FlowFromDOMFactory.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/FlowFromDOMFactory.java @@ -133,16 +133,6 @@ public static ProcessGroupDTO getProcessGroup(final String parentId, final Eleme final Set processGroups = new HashSet<>(); final Set remoteProcessGroups = new HashSet<>(); - final FlowSnippetDTO groupContents = new FlowSnippetDTO(); - groupContents.setConnections(connections); - groupContents.setFunnels(funnels); - groupContents.setInputPorts(inputPorts); - groupContents.setLabels(labels); - groupContents.setOutputPorts(outputPorts); - groupContents.setProcessGroups(processGroups); - groupContents.setProcessors(processors); - groupContents.setRemoteProcessGroups(remoteProcessGroups); - NodeList nodeList = DomUtils.getChildNodesByTagName(element, "processor"); for (int i = 0; i < nodeList.getLength(); i++) { processors.add(getProcessor((Element) nodeList.item(i), encryptor)); @@ -183,6 +173,16 @@ public static ProcessGroupDTO getProcessGroup(final String parentId, final Eleme connections.add(getConnection((Element) nodeList.item(i))); } + final FlowSnippetDTO groupContents = new FlowSnippetDTO(); + groupContents.setConnections(connections); + groupContents.setFunnels(funnels); + groupContents.setInputPorts(inputPorts); + groupContents.setLabels(labels); + groupContents.setOutputPorts(outputPorts); + groupContents.setProcessGroups(processGroups); + groupContents.setProcessors(processors); + groupContents.setRemoteProcessGroups(remoteProcessGroups); + dto.setContents(groupContents); return dto; }