Skip to content

Commit e4ecba1

Browse files
authored
Merge pull request #396 from pshipton/disablezlibnx
Disable use of zlibNX by default
2 parents 2aacbe5 + e90fcd1 commit e4ecba1

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/java.base/unix/native/libjli/java_md.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
/*
2727
* ===========================================================================
28-
* (c) Copyright IBM Corp. 2020, 2023 All Rights Reserved
28+
* (c) Copyright IBM Corp. 2020, 2024 All Rights Reserved
2929
* ===========================================================================
3030
*/
3131

@@ -376,7 +376,7 @@ CreateExecutionEnvironment(int *pargc, char ***pargv,
376376
* o $JVMPATH (directory portion only)
377377
* o $JRE/lib
378378
* o $JRE/../lib
379-
* o ZLIBNX_PATH (for AIX P9 or newer systems with NX, unless -XX:-UseZlibNX is set)
379+
* o ZLIBNX_PATH (for AIX P9 or newer systems with NX, when enabled)
380380
*
381381
* followed by the user's previous effective LD_LIBRARY_PATH, if
382382
* any.
@@ -386,7 +386,7 @@ CreateExecutionEnvironment(int *pargc, char ***pargv,
386386
int aixargc = *pargc - 1; // skip the launcher name
387387
char **aixargv = *pargv + 1;
388388
const char *aixarg = NULL;
389-
jboolean useZlibNX = JNI_TRUE;
389+
jboolean useZlibNX = JNI_FALSE;
390390
while (aixargc > 0 && *(aixarg = *aixargv) == '-') {
391391
if (JLI_StrCmp(aixarg, "-XX:+UseZlibNX") == 0) {
392392
useZlibNX = JNI_TRUE;

0 commit comments

Comments
 (0)