Merge "Fix critical issues in dcaegen2-collectors-ves"

2 files changed, 4 insertions, 3 deletions

diff --git a/src/main/java/org/onap/dcae/commonFunction/ConfigProcessors.java b/src/main/java/org/onap/dcae/commonFunction/ConfigProcessors.java
index a9d6b981..09ceeac7 100644
--- a/src/main/java/org/onap/dcae/commonFunction/ConfigProcessors.java
+++ b/src/main/java/org/onap/dcae/commonFunction/ConfigProcessors.java
@@ -166,7 +166,7 @@ public class ConfigProcessors {
         if (filter == null || isFilterMet(filter)) {
 
             final JSONObject oldValue = (JSONObject) getEventObjectVal(oldField);
-            if (!oldValue.equals(OBJECT_NOT_FOUND)) {
+            if (!oldValue.toString().equals(OBJECT_NOT_FOUND)) {
                 setEventObjectVal(field, oldValue);
                 removeEventKey(oldField);
             }
@@ -293,7 +293,7 @@ public class ConfigProcessors {
             JSONObject tempJObj = null;
             String tempName = "";
             String tempValue = "";
-            if (!arrayValue.equals(OBJECT_NOT_FOUND)) {
+            if (!arrayValue.toString().equals(OBJECT_NOT_FOUND)) {
                 log.info("old value ==" + arrayValue.toString());
                 // Loop thru the JSONArray, get the name:value pair and write to new JSONObject as hashmap elements
                 for (int i = 0; i < arrayValue.length(); i++) {
@@ -301,7 +301,7 @@ public class ConfigProcessors {
                 	tempJObj = arrayValue.getJSONObject(i);
                     if (tempJObj != null) {
                         tempName = tempJObj.get("name").toString();
-                        tempValue = tempJObj.get("value").toString();
+                        tempValue = tempJObj.get(VALUE).toString();
                         newHashMap.put(tempName, tempValue);
                     }
                 }
diff --git a/src/main/java/org/onap/dcae/commonFunction/event/publishing/DMaaPPublishersCache.java b/src/main/java/org/onap/dcae/commonFunction/event/publishing/DMaaPPublishersCache.java
index 4cdf92da..c66cee05 100644
--- a/src/main/java/org/onap/dcae/commonFunction/event/publishing/DMaaPPublishersCache.java
+++ b/src/main/java/org/onap/dcae/commonFunction/event/publishing/DMaaPPublishersCache.java
@@ -99,6 +99,7 @@ class DMaaPPublishersCache {
                     }
                 } catch (InterruptedException | IOException e) {
                     log.error("Could not close Cambria publisher, some messages might have been dropped", e);
+                    Thread.currentThread().interrupt();
                 }
             }
         }