Address review comments

ibmruntimes · Nov 28, 2023 · d54d2e9 · d54d2e9
1 parent d637b49
commit d54d2e9
Showing 1 changed file with 17 additions and 15 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
@@ -311,22 +311,22 @@ private static void getProfileID(Properties props) {
             }
             String defaultMatch = null;
             for (Object keyObject : props.keySet()) {
-                // A matching property is found.
                 if (keyObject instanceof String key) {
-                    if (key.startsWith(potentialProfileID)) {
-                        // Find the property for specifying if this is the default profile.
-                        if (key.endsWith(".desc.default")) {
-                            // Check if property is set to true.
-                            if (Boolean.parseBoolean(props.getProperty(key))) {
-                                // Check if multiple defaults exist and act accordingly.
-                                if (defaultMatch == null) {
-                                    defaultMatch = key.split("\\.desc")[0];
-                                } else {
-                                    printStackTraceAndExit("Multiple default RestrictedSecurity"
-                                            + " profiles for " + selectedProfile);
-                                }
+                    /* Find the property that pertains to this profileID and indicates whether
+                     * it is the default one.
+                     */
+                    if (key.startsWith(potentialProfileID) && key.endsWith(".desc.default")) {
+                        // Check if property is set to true.
+                        if (Boolean.parseBoolean(props.getProperty(key))) {
+                            // Check if multiple defaults exist and act accordingly.
+                            if (defaultMatch == null) {
+                                defaultMatch = key.split("\\.desc")[0];
+                            } else {
+                                printStackTraceAndExit("Multiple default RestrictedSecurity"
+                                        + " profiles for " + selectedProfile);
                             }
                         }
+
                     }
                 }
             }
@@ -341,11 +341,13 @@ private static void getProfileID(Properties props) {
 
     private static void checkIfKnownProfileSupported() {
         if (profileID.contains("NSS") && !isNSSSupported) {
-            printStackTraceAndExit("NSS profiles are not supported on this platform.");
+            printStackTraceAndExit("NSS RestrictedSecurity profiles are not supported"
+                    + " on this platform.");
         }
 
         if (profileID.contains("OpenJCEPlus") && !isOpenJCEPlusSupported) {
-            printStackTraceAndExit("OpenJCEPlus profiles are not supported on this platform.");
+            printStackTraceAndExit("OpenJCEPlus RestrictedSecurity profiles are not supported"
+                    + " on this platform.");
         }
 
         if (debug != null) {