This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.19 in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 0f9541aa1e14ebf373dfe216a0b353308dd12323 Author: simonbence <[email protected]> AuthorDate: Thu Dec 1 17:09:51 2022 +0100 NIFI-10914 Adjusting input check for loading nested versioned flows (#6741) --- .../src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java index dee9a7e9bd..126bc41ca3 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java @@ -2015,9 +2015,11 @@ public class ProcessGroupResource extends FlowUpdateResource<ProcessGroupImportE final RegisteredFlowSnapshot flowSnapshot = getFlowFromRegistry(versionControlInfo); // Step 3: Enrich version control info came from UI - if (flowSnapshot.getFlowContents() != null && flowSnapshot.getFlowContents().getVersionedFlowCoordinates() != null) { + if (flowSnapshot.getFlowContents() != null) { final VersionedFlowCoordinates versionedFlowCoordinates = flowSnapshot.getFlowContents().getVersionedFlowCoordinates(); - flowSnapshot.getFlowContents().getVersionedFlowCoordinates().setStorageLocation(versionedFlowCoordinates.getStorageLocation()); + if (versionedFlowCoordinates != null) { + versionControlInfo.setStorageLocation(versionedFlowCoordinates.getStorageLocation()); + } } // Step 4: Resolve Bundle info
