From: Guobiao Mo <guobiaomo@chinamobile.com>
Date: Fri, 28 Sep 2018 19:40:15 +0000 (-0700)
Subject: Fix String compare
X-Git-Tag: 1.2.1~3
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=holmes%2Fcommon.git;a=commitdiff_plain;h=480e77e15e0da305d10374d12ad5e999f64f797d

Fix String compare

Issue-ID: HOLMES-172

Change-Id: Ie49b1088cb04dbf94b83830224bcd7464870e001
Signed-off-by: Guobiao Mo <guobiaomo@chinamobile.com>
---

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/DmaapService.java b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/DmaapService.java
index f19b89c..db57f3c 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/DmaapService.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/DmaapService.java
@@ -15,6 +15,7 @@
  */
 package org.onap.holmes.common.dmaap;
 
+import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
@@ -186,12 +187,13 @@ public class DmaapService {
     }
 
     private void deleteRequestId(PolicyMsg policyMsg){
-        String status = policyMsg.getClosedLoopEventStatus().toString();
-        if(status == "ABATED"){
+    	EVENT_STATUS status = policyMsg.getClosedLoopEventStatus();
+        if(EVENT_STATUS.ABATED.equals(status)) {
             String requestId = policyMsg.getRequestID();
-            for(String key: alarmUniqueRequestID.keySet()){
-                if(alarmUniqueRequestID.get(key).equals(requestId)){
-                    alarmUniqueRequestID.remove(key);
+            for(Entry<String, String> kv: alarmUniqueRequestID.entrySet()) {
+                if(kv.getValue().equals(requestId)) {
+                    alarmUniqueRequestID.remove(kv.getKey());
+                    break;
                 }
             }
             log.info("Clear alarm, requestId deleted successful");