Code Review
/
policy
/
engine.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix brmsgw regex handling for dependecies
[policy/engine.git]
/
BRMSGateway
/
src
/
main
/
java
/
org
/
onap
/
policy
/
brmsInterface
/
BRMSPush.java
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
fd864fd
..
a1113f5
100644
(file)
--- 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.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;
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();
} 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
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 );
// 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;
kSessionName = "closedloop";
} else {
kSessionName = "closedloop-" + selectedName;