diff --git a/dev/com.ibm.ws.kernel.boot.core/src/com/ibm/ws/kernel/boot/internal/KernelBootstrap.java b/dev/com.ibm.ws.kernel.boot.core/src/com/ibm/ws/kernel/boot/internal/KernelBootstrap.java index e93f3993adce..5b92f7d3b7b9 100644 --- a/dev/com.ibm.ws.kernel.boot.core/src/com/ibm/ws/kernel/boot/internal/KernelBootstrap.java +++ b/dev/com.ibm.ws.kernel.boot.core/src/com/ibm/ws/kernel/boot/internal/KernelBootstrap.java @@ -305,7 +305,7 @@ public ReturnCode shutdown(boolean force) throws InterruptedException { return serverLock.waitForStop(); } - // Server did not propertly start (no delegate), so stop is fine. + // Server did not properly start (no delegate), so stop is fine. return ReturnCode.OK; } @@ -438,7 +438,7 @@ public ClassLoader run() { * Set Java 2 Security if enabled */ public static void enableJava2SecurityIfSet(BootstrapConfig bootProps, List urlList) { - if (bootProps.get(BootstrapConstants.JAVA_2_SECURITY_PROPERTY) != null) { + if (bootProps.get(BootstrapConstants.JAVA_2_SECURITY_PROPERTY) != null && javaVersion() < 24) { NameBasedLocalBundleRepository repo = new NameBasedLocalBundleRepository(bootProps.getInstallRoot()); File bestMatchFile = repo.selectBundle("com.ibm.ws.org.eclipse.equinox.region", @@ -493,7 +493,7 @@ private static void processVersion(BootstrapConfig bootProps, String msgKey, Str String bsConsoleFormat = bootProps.get("com.ibm.ws.logging.console.format"); String envConsoleFormat = System.getenv("WLP_LOGGING_CONSOLE_FORMAT"); - //boostrap format should take precedence + //bootstrap format should take precedence String consoleFormat = bsConsoleFormat != null ? bsConsoleFormat : envConsoleFormat; if (productDisplayName == null) { @@ -756,4 +756,14 @@ public String run() { } return false; } + + private static int javaVersion() { + String version = System.getProperty("java.version"); + String[] versionElements = version.split("\\D"); // split on non-digits + + // Pre-JDK 9 the java.version is 1.MAJOR.MINOR + // Post-JDK 9 the java.version is MAJOR.MINOR + int i = Integer.valueOf(versionElements[0]) == 1 ? 1 : 0; + return Integer.valueOf(versionElements[i]); + } }