Update according to code review

ibmruntimes · Mar 21, 2023 · 9c6e37f · 9c6e37f
1 parent 6410bbf
commit 9c6e37f
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/closed/src/java.base/share/classes/openj9/internal/security/RestrictedSecurity.java b/closed/src/java.base/share/classes/openj9/internal/security/RestrictedSecurity.java
@@ -664,8 +664,8 @@ private void initConstraints() {
                     debug.println("Loading constraints for security provider: " + providerName);
                 }
 
-                // Check if the provider has constraints
-                if (providerInfo.indexOf('[') < 0 && providerInfo.indexOf(']') < 0) {
+                // Check if the provider has constraints.
+                if (providerInfo.indexOf('[') < 0) {
                     if (debug != null) {
                         debug.println("No constraints for security provider: " + providerName);
                     }
@@ -675,15 +675,15 @@ private void initConstraints() {
 
                 // Remove the whitespaces in the format separator if there are.
                 providerInfo = providerInfo.trim()
-                        .replaceAll("\\[\\s*\\{", "[{")
-                        .replaceAll("\\}\\s*\\]", "}]")
+                        .replaceAll("\\[\\s+\\{", "[{")
+                        .replaceAll("\\}\\s+\\]", "}]")
                         .replaceAll("\\}\\s*,\\s*\\{", "},{");
 
-                int startIndex = providerInfo.indexOf("[{");
+                int startIndex = providerInfo.lastIndexOf("[{");
                 int endIndex = providerInfo.indexOf("}]");
 
                 // Provider with constraints.
-                if ((startIndex > 0) && (endIndex > 0)) {
+                if ((startIndex > 0) && (endIndex > startIndex)) {
                     String[] constrArray = providerInfo
                             .substring(startIndex + 2, endIndex).split("\\},\\{");