summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorParshad Patel <pars.patel@samsung.com>2018-11-19 16:42:49 +0900
committerParshad Patel <pars.patel@samsung.com>2018-11-19 16:46:48 +0900
commit314f38cc8aa86d65a664b4f357e3fdea8eede96a (patch)
tree9a58de488efab6da3f7de971e2e1e07175472a92 /src
parent174e08b4c4942eaa70cea889b4819334145216b9 (diff)
Fix critical issues in dcaegen2-collectors-ves
Fix issue related to InterruptedException and equals comparisons between unrelated types Issue-ID: DCAEGEN2-938 Change-Id: Iaef089dfd889053737fa53616064f1a6ef3a929e Signed-off-by: Parshad Patel <pars.patel@samsung.com>
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/onap/dcae/commonFunction/ConfigProcessors.java6
-rw-r--r--src/main/java/org/onap/dcae/commonFunction/event/publishing/DMaaPPublishersCache.java1
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();
}
}
}