From 074fcb2a278ee411f4eb19c7bf860d345c4512a7 Mon Sep 17 00:00:00 2001 From: pa834y Date: Fri, 9 Mar 2018 12:13:30 -0500 Subject: [PATCH] Fix brmsgw regex handling for dependecies Issue-ID: POLICY-684 Change-Id: I3a8fbbaebf4fdfcd097edcc367e06ef8807aa3bc Signed-off-by: pa834y --- .../src/main/java/org/onap/policy/brmsInterface/BRMSPush.java | 5 +++-- 1 file 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 dependencyStrings = Arrays.asList(value.split("},{")); + List 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; -- 2.16.6