File tree 1 file changed +3
-6
lines changed
closed/src/java.base/share/classes/openj9/internal/security
1 file changed +3
-6
lines changed Original file line number Diff line number Diff line change @@ -68,7 +68,7 @@ public final class RestrictedSecurity {
68
68
69
69
private static final boolean isNSSSupported ;
70
70
private static final boolean isOpenJCEPlusSupported ;
71
- private static boolean isOpenJCEPlusModuleExist ;
71
+ private static final boolean isOpenJCEPlusModuleExist ;
72
72
73
73
private static final boolean userSetProfile ;
74
74
private static final boolean shouldEnableSecurity ;
@@ -140,12 +140,9 @@ public String[] run() {
140
140
isOpenJCEPlusSupported = isOsSupported && isArchSupported ;
141
141
142
142
// Check whether the OpenJCEPlus module exists.
143
- isOpenJCEPlusModuleExist = false ;
144
143
ModuleLayer layer = ModuleLayer .boot ();
145
144
Optional <Module > module = layer .findModule ("openjceplus" );
146
- if (module .isPresent ()) {
147
- isOpenJCEPlusModuleExist = true ;
148
- }
145
+ isOpenJCEPlusModuleExist = module .isPresent ();
149
146
150
147
// Check the default solution to see if FIPS is supported.
151
148
isFIPSSupported = isNSSSupported ;
@@ -397,7 +394,7 @@ private static void checkIfKnownProfileSupported() {
397
394
+ " on this platform." );
398
395
}
399
396
400
- if (profileID .contains ("OpenJCEPlus" ) && ! isOpenJCEPlusModuleExist ) {
397
+ if (! isOpenJCEPlusModuleExist && profileID .contains ("OpenJCEPlus" )) {
401
398
printStackTraceAndExit ("FIPS 140-3 profile specified. Required OpenJCEPlus"
402
399
+ " module not found." );
403
400
}
You can’t perform that action at this time.
0 commit comments