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>

1 files changed, 7 insertions, 1 deletions

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() {