aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichaelMorris <michael.morris@est.tech>2023-01-31 15:23:35 +0000
committerVasyl Razinkov <vasyl.razinkov@est.tech>2023-02-02 12:20:28 +0000
commit125398fd17bc923b561998972e7106d9b5bf0165 (patch)
treeac9b274a9352ec6a7e28181307c8f302cb869e29
parente61d26cb2a74813b526e10864af4d73f04df2650 (diff)
Fix NPE when deleting interface operation
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-4364 Change-Id: If4072bd37e2fd361a59eb5c3e503c152c93b5d96
-rw-r--r--catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InterfaceOperationBusinessLogic.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InterfaceOperationBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InterfaceOperationBusinessLogic.java
index 69f7ee0f88..fa93e8b3a4 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InterfaceOperationBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InterfaceOperationBusinessLogic.java
@@ -130,8 +130,9 @@ public class InterfaceOperationBusinessLogic extends BaseBusinessLogic {
if (validateDeleteOperationContainsNoMappedOutputResponse.isRight()) {
return Either.right(validateDeleteOperationContainsNoMappedOutputResponse.right().value());
}
- String artifactUniqueId = storedOperation.getImplementation().getUniqueId();
- if (artifactUniqueId != null && !InterfaceOperationUtils.isArtifactInUse(storedComponent, operationId, artifactUniqueId)) {
+ final ArtifactDataDefinition implementation = storedOperation.getImplementation();
+ if (implementation != null && implementation.getUniqueId() != null && !InterfaceOperationUtils.isArtifactInUse(storedComponent, operationId, implementation.getUniqueId())) {
+ final String artifactUniqueId = implementation.getUniqueId();
Either<ArtifactDefinition, StorageOperationStatus> getArtifactEither = artifactToscaOperation
.getArtifactById(storedComponent.getUniqueId(), artifactUniqueId);
if (getArtifactEither.isLeft()) {
@@ -142,7 +143,7 @@ public class InterfaceOperationBusinessLogic extends BaseBusinessLogic {
janusGraphDao.rollback();
ResponseFormat responseFormatByArtifactId = componentsUtils
.getResponseFormatByArtifactId(componentsUtils.convertFromStorageResponse(removeArifactFromComponent.right().value()),
- storedOperation.getImplementation().getArtifactDisplayName());
+ implementation.getArtifactDisplayName());
return Either.right(responseFormatByArtifactId);
}
CassandraOperationStatus cassandraStatus = artifactCassandraDao.deleteArtifact(artifactUniqueId);
@@ -150,7 +151,7 @@ public class InterfaceOperationBusinessLogic extends BaseBusinessLogic {
janusGraphDao.rollback();
ResponseFormat responseFormatByArtifactId = componentsUtils.getResponseFormatByArtifactId(
componentsUtils.convertFromStorageResponse(componentsUtils.convertToStorageOperationStatus(cassandraStatus)),
- storedOperation.getImplementation().getArtifactDisplayName());
+ implementation.getArtifactDisplayName());
return Either.right(responseFormatByArtifactId);
}
}