This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.11.x in repository https://gitbox.apache.org/repos/asf/nifi.git
commit b7cbd23f7c22de6453e6f83c5f492f74e17b3238 Author: Bryan Bende <[email protected]> AuthorDate: Fri Mar 6 16:08:09 2020 -0500 NIFI-7224 Protecting against possible NPE in ImportFlowVersion command in CLI Signed-off-by: Pierre Villard <[email protected]> This closes #4121. --- .../toolkit/cli/impl/command/registry/flow/ImportFlowVersion.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/registry/flow/ImportFlowVersion.java b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/registry/flow/ImportFlowVersion.java index d9a3530..c02f38e 100644 --- a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/registry/flow/ImportFlowVersion.java +++ b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/registry/flow/ImportFlowVersion.java @@ -89,7 +89,11 @@ public class ImportFlowVersion extends AbstractNiFiRegistryCommand<StringResult> metadata.setBucketIdentifier(versionedFlow.getBucketIdentifier()); metadata.setFlowIdentifier(flowId); metadata.setVersion(version); - metadata.setComments(deserializedSnapshot.getSnapshotMetadata().getComments()); + + final VersionedFlowSnapshotMetadata deserializedSnapshotMetadata = deserializedSnapshot.getSnapshotMetadata(); + if (deserializedSnapshotMetadata != null) { + metadata.setComments(deserializedSnapshotMetadata.getComments()); + } // create a new snapshot using the new metadata and the contents from the deserialized snapshot final VersionedFlowSnapshot snapshot = new VersionedFlowSnapshot();
