diff options
author | shashikanth <shashikanth.vh@huawei.com> | 2017-09-20 12:16:52 +0530 |
---|---|---|
committer | shashikanth <shashikanth.vh@huawei.com> | 2017-09-20 12:16:53 +0530 |
commit | e4ec0393447f52276aa246dad29f116487c9bb28 (patch) | |
tree | 5407b6082640ec471c0009d3916b5b3f5163b3ab | |
parent | a40af07cdb70ab61e06e68d020ff398cc9055828 (diff) |
Fix Blocker/Critical sonar issues
Fix Blocker/Critical sonar issues in aai/sparky-be module
https://sonar.onap.org/component_issues?id=org.openecomp.aai.sparky-be%3Asparky-be#resolved=false|severities=BLOCKER
Fixed condition that it does not always evaluate to "true"
Issue-Id:AAI-342
Change-Id: I7ac764c1619a834bb9c9c2bf4ce29b9bae294c0f
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
-rw-r--r-- | src/main/java/org/openecomp/sparky/synchronizer/ElasticSearchIndexCleaner.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/main/java/org/openecomp/sparky/synchronizer/ElasticSearchIndexCleaner.java b/src/main/java/org/openecomp/sparky/synchronizer/ElasticSearchIndexCleaner.java index b23764c..9ef4fe6 100644 --- a/src/main/java/org/openecomp/sparky/synchronizer/ElasticSearchIndexCleaner.java +++ b/src/main/java/org/openecomp/sparky/synchronizer/ElasticSearchIndexCleaner.java @@ -521,11 +521,6 @@ public class ElasticSearchIndexCleaner implements IndexCleaner { } JsonNode rootNode = parseElasticSearchResult(opResult.getResult()); - boolean timedOut = Boolean.parseBoolean(getFieldValue(rootNode, "timed_out")); - final String tookStr = getFieldValue(rootNode, "took"); - int tookInMs = (tookStr == null) ? 0 : Integer.parseInt(tookStr); - - JsonNode hitsNode = rootNode.get("hits"); /* * Check the result for success / failure, and enumerate all the index ids that resulted in @@ -533,6 +528,11 @@ public class ElasticSearchIndexCleaner implements IndexCleaner { */ if (rootNode != null) { + boolean timedOut = Boolean.parseBoolean(getFieldValue(rootNode, "timed_out")); + final String tookStr = getFieldValue(rootNode, "took"); + int tookInMs = (tookStr == null) ? 0 : Integer.parseInt(tookStr); + + JsonNode hitsNode = rootNode.get("hits"); if (timedOut) { LOG.info(AaiUiMsgs.COLLECT_TIME_WITH_ERROR, "Scroll Context", String.valueOf(tookInMs)); @@ -576,6 +576,9 @@ public class ElasticSearchIndexCleaner implements IndexCleaner { } } + } else { + // scroll context get failed, nothing else to do + LOG.error(AaiUiMsgs.ERROR_GENERIC, opResult.toString()); } return OperationState.OK; |