From: MichaelMorris <michael.morris@est.tech>
Date: Fri, 9 Dec 2022 15:32:47 +0000 (+0000)
Subject: Fix NPE when checking out service
X-Git-Tag: 1.12.1~50
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdc.git;a=commitdiff_plain;h=c4e23cbf41736a1c516d7dc77ca4e09f59bda7f4

Fix NPE when checking out service

Signed-off-by: MichaelMorris <michael.morris@est.tech>
Issue-ID: SDC-4303
Change-Id: I512f3502ff2451749c2fbc590d08c3a10b3bef79
---

diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaElementLifecycleOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaElementLifecycleOperation.java
index 3ee79e73ef..caed1e8771 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaElementLifecycleOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaElementLifecycleOperation.java
@@ -784,7 +784,7 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
                         List<String> artifactsId = new ArrayList<>();
                         if (instDeplArtifMap != null) {
                             for (ArtifactDataDefinition artifact : instDeplArtifMap.values()) {
-                                Optional<String> op = group.getArtifacts().stream().filter(p -> p.equals(artifact.getGeneratedFromId())).findAny();
+                                Optional<String> op = group.getArtifacts() == null ? Optional.empty() : group.getArtifacts().stream().filter(p -> p.equals(artifact.getGeneratedFromId())).findAny();
                                 if (op.isPresent()) {
                                     artifactsUid.add(artifact.getArtifactUUID());
                                     artifactsId.add(artifact.getUniqueId());