From: leventecsanyi <levente.csanyi@est.tech>
Date: Mon, 5 Feb 2024 10:19:34 +0000 (+0100)
Subject: CmHandle delete is failing with InternalServerError: Null key is not allowed
X-Git-Tag: 3.4.3~11
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=e1cddc550e45890553de478a9c07fa424aa3811b;p=cps.git

CmHandle delete is failing with InternalServerError: Null key is not allowed

   - added null check to alt id removal from cache

Issue-ID: CPS-2064
Change-Id: Iee484b96f505106613ce2d646898ca7ee3873f28
Signed-off-by: leventecsanyi <levente.csanyi@est.tech>
---

diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/utils/CmHandleIdMapper.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/utils/CmHandleIdMapper.java
index 8175fb5e7..a88adbd11 100644
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/utils/CmHandleIdMapper.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/utils/CmHandleIdMapper.java
@@ -73,7 +73,13 @@ public class CmHandleIdMapper {
 
     public void removeMapping(final String cmHandleId) {
         final String alternateId = alternateIdPerCmHandleId.remove(cmHandleId);
-        cmHandleIdPerAlternateId.remove(alternateId);
+        removeAlternateIdWithValidation(alternateId);
+    }
+
+    private void removeAlternateIdWithValidation(final String alternateId) {
+        if (alternateId != null) {
+            cmHandleIdPerAlternateId.remove(alternateId);
+        }
     }
 
     private void initializeCache() {