summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2020-06-29 16:46:56 +0000
committerGerrit Code Review <gerrit@onap.org>2020-06-29 16:46:56 +0000
commit9216163ead0c64653544dc674992e485ad98549b (patch)
tree5f14e4fa9c6c4f90ebbf2a4bef7414c4a3ad08b5
parent119a9c73934c57046ed1e591a7e26dd67c715aa9 (diff)
parent4744cd180b629a2cf1e44fbe262a1289b19a0caa (diff)
Merge "sonar fix - FeatureServerPool"
-rw-r--r--feature-server-pool/src/main/java/org/onap/policy/drools/serverpool/FeatureServerPool.java15
1 files changed, 5 insertions, 10 deletions
diff --git a/feature-server-pool/src/main/java/org/onap/policy/drools/serverpool/FeatureServerPool.java b/feature-server-pool/src/main/java/org/onap/policy/drools/serverpool/FeatureServerPool.java
index 23da0712..cce7a09d 100644
--- a/feature-server-pool/src/main/java/org/onap/policy/drools/serverpool/FeatureServerPool.java
+++ b/feature-server-pool/src/main/java/org/onap/policy/drools/serverpool/FeatureServerPool.java
@@ -120,8 +120,8 @@ public class FeatureServerPool
* Example <field-list>: requestID,CommonHeader.RequestID
*
* Table generated from this example has length 2:
- * table[0] = {"requestID"}
- * table[1] = {"CommonHeader", "RequestID"}
+ * table 0 is "requestID"
+ * table 1 is "CommonHeader", "RequestID"
*/
private static HashMap<String, String[][]> topicToPaths = new HashMap<>();
@@ -319,17 +319,12 @@ public class FeatureServerPool
path[path.length - 1] = fieldName;
}
keyword = sco.getString(path);
+
if (keyword != null) {
- if (conversionFunctionName == null) {
- // We found a keyword -- we don't need to try other paths,
- // so we should break out of the loop
- break;
+ if (conversionFunctionName != null) {
+ keyword = Keyword.convertKeyword(keyword, conversionFunctionName);
}
-
- // we have post-processing to do
- keyword = Keyword.convertKeyword(keyword, conversionFunctionName);
if (keyword != null) {
- // conversion was successful
break;
}
}