You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jp...@apache.org on 2016/07/20 20:17:42 UTC
nifi git commit: NIFI-2330: Ensure that we set ProcessGroupDTO's
contents after populating sets of components,
as the contents dto now copies the sets
Repository: nifi
Updated Branches:
refs/heads/master 2a8be9548 -> 39a4d84a6
NIFI-2330: Ensure that we set ProcessGroupDTO's contents after populating sets of components, as the contents dto now copies the sets
This closes #686
Signed-off-by: jpercivall <jo...@yahoo.com>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/39a4d84a
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/39a4d84a
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/39a4d84a
Branch: refs/heads/master
Commit: 39a4d84a62859a1d0ef51a5755e7b4c61086a800
Parents: 2a8be95
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Jul 20 11:57:41 2016 -0400
Committer: jpercivall <jo...@yahoo.com>
Committed: Wed Jul 20 16:05:42 2016 -0400
----------------------------------------------------------------------
.../serialization/FlowFromDOMFactory.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/39a4d84a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/FlowFromDOMFactory.java
----------------------------------------------------------------------
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 ef910ab..1409df4 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 class FlowFromDOMFactory {
final Set<ProcessGroupDTO> processGroups = new HashSet<>();
final Set<RemoteProcessGroupDTO> 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 class FlowFromDOMFactory {
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;
}