aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Hernandez <jh1730@att.com>2018-03-09 20:33:39 +0000
committerGerrit Code Review <gerrit@onap.org>2018-03-09 20:33:39 +0000
commit38fa76cdcbe32e2df1da8f483b561395cd010bb3 (patch)
tree343f4055112861a3b4f12d15922a16b6da63967d
parent4e9205fe5586a33461e8207e446147948d3fd309 (diff)
parent074fcb2a278ee411f4eb19c7bf860d345c4512a7 (diff)
Merge "Fix brmsgw regex handling for dependecies"
-rw-r--r--BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java b/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java
index fd864fded..a1113f53d 100644
--- a/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java
+++ b/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java
@@ -46,6 +46,7 @@ import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
+import java.util.regex.Pattern;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
@@ -423,7 +424,7 @@ public class BRMSPush {
} else if ("$dependency$".equals(key) && value.startsWith("[") && value.endsWith("]")) {
value = value.substring(1, value.length() - 1).trim();
- List<String> dependencyStrings = Arrays.asList(value.split("},{"));
+ List<String> dependencyStrings = Arrays.asList(value.split(Pattern.quote("},{")));
for (String dependencyString : dependencyStrings) {
try {
userDependencies
@@ -452,7 +453,7 @@ public class BRMSPush {
// closedLoop
if (kSessionName == null) {
LOGGER.info("kSessionName is null, selectedName is : " + selectedName );
- if (selectedName == defaultName) {
+ if (selectedName.equalsIgnoreCase(defaultName)) {
kSessionName = "closedloop";
} else {
kSessionName = "closedloop-" + selectedName;