Merge "Remove event notifications when removing trust level entries"

1 files changed, 2 insertions, 6 deletions

diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/trustlevel/TrustLevelManager.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/trustlevel/TrustLevelManager.java
index 33310b955e..aff0e19981 100644
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/trustlevel/TrustLevelManager.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/trustlevel/TrustLevelManager.java
@@ -145,17 +145,13 @@ public class TrustLevelManager {
     }
 
     /**
-     * Remove cm handle trust level from the cache and publish notification for trust level of cmHandles
-     * if it is COMPLETE.
+     * Remove cm handle trust level from the cache.
      *
      * @param cmHandleIds       cm handle ids to be removed from the cache
      */
     public void removeCmHandles(final Collection<String> cmHandleIds) {
         for (final String cmHandleId : cmHandleIds) {
-            if (trustLevelPerCmHandle.containsKey(cmHandleId)) {
-                final TrustLevel oldTrustLevel = trustLevelPerCmHandle.remove(cmHandleId);
-                sendAvcNotificationIfRequired(cmHandleId, oldTrustLevel, TrustLevel.NONE);
-            } else {
+            if (trustLevelPerCmHandle.remove(cmHandleId) == null) {
                 log.debug("Removed Cm handle: {} is not in trust level cache", cmHandleId);
             }
         }