Fix brmsgw regex handling for dependecies 75/34975/1
authorpa834y <pa834y@att.com>
Fri, 9 Mar 2018 17:13:30 +0000 (12:13 -0500)
committerpa834y <pa834y@att.com>
Fri, 9 Mar 2018 17:17:51 +0000 (12:17 -0500)
Issue-ID: POLICY-684
Change-Id: I3a8fbbaebf4fdfcd097edcc367e06ef8807aa3bc
Signed-off-by: pa834y <pa834y@att.com>
BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java

index fd864fd..a1113f5 100644 (file)
@@ -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;