Skip to content

Commit

Permalink
Merge pull request #823 from pshipton/disablezlibnx
Browse files Browse the repository at this point in the history
Disable use of zlibNX by default
  • Loading branch information
keithc-ca authored Oct 9, 2024
2 parents 20b15c1 + 806e72c commit ccb9a8d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/java.base/unix/native/libjli/java_md_solinux.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

/*
* ===========================================================================
* (c) Copyright IBM Corp. 2020, 2023 All Rights Reserved
* (c) Copyright IBM Corp. 2020, 2024 All Rights Reserved
* ===========================================================================
*/

Expand Down Expand Up @@ -385,7 +385,7 @@ CreateExecutionEnvironment(int *pargc, char ***pargv,
* o $JVMPATH (directory portion only)
* o $JRE/lib
* o $JRE/../lib
* o ZLIBNX_PATH (for AIX P9 or newer systems with NX, unless -XX:-UseZlibNX is set)
* o ZLIBNX_PATH (for AIX P9 or newer systems with NX, when enabled)
*
* followed by the user's previous effective LD_LIBRARY_PATH, if
* any.
Expand All @@ -395,7 +395,7 @@ CreateExecutionEnvironment(int *pargc, char ***pargv,
int aixargc = *pargc - 1; // skip the launcher name
char **aixargv = *pargv + 1;
const char *aixarg = NULL;
jboolean useZlibNX = JNI_TRUE;
jboolean useZlibNX = JNI_FALSE;
while (aixargc > 0 && *(aixarg = *aixargv) == '-') {
if (JLI_StrCmp(aixarg, "-XX:+UseZlibNX") == 0) {
useZlibNX = JNI_TRUE;
Expand Down

0 comments on commit ccb9a8d

Please sign in to comment.