From 570fc7f1fa4e4a73ec482bf9bf4dcd4126249fbb Mon Sep 17 00:00:00 2001
From: simonbence <61191107+simonbence@users.noreply.github.com>
Date: Thu, 1 Dec 2022 17:09:51 +0100
Subject: [PATCH] NIFI-10914 Adjusting input check for loading nested versioned
 flows (#6741)

---
 .../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