Skip to content

Commit 04ddd2e

Browse files
authored
Merge pull request eclipse-openj9#21068 from theresa-m/securitymanager_6
Include J9VMInternals_doPrivileged methods for Java 8 Windows only
2 parents 8bbc086 + 31dcac2 commit 04ddd2e

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

runtime/j9vm/j7vmi.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,8 @@ JVM_DisableCompiler(jint arg0, jint arg1)
331331
return NULL;
332332
}
333333

334+
#if (JAVA_SPEC_VERSION == 8) && defined(WIN32)
335+
/* Do not remove: this method is required by Windows IBM Java 8 builds. */
334336
static jclass
335337
java_lang_J9VMInternals(JNIEnv* env)
336338
{
@@ -354,6 +356,7 @@ java_lang_J9VMInternals(JNIEnv* env)
354356
return cached;
355357
}
356358

359+
/* Do not remove: this method is required by Windows IBM Java 8 builds. */
357360
static jmethodID
358361
java_lang_J9VMInternals_doPrivileged(JNIEnv* env)
359362
{
@@ -367,6 +370,7 @@ java_lang_J9VMInternals_doPrivileged(JNIEnv* env)
367370
return cached;
368371
}
369372

373+
/* Do not remove: this method is required by Windows IBM Java 8 builds. */
370374
static jmethodID
371375
java_lang_J9VMInternals_doPrivilegedWithException(JNIEnv* env)
372376
{
@@ -380,7 +384,6 @@ java_lang_J9VMInternals_doPrivilegedWithException(JNIEnv* env)
380384
return cached;
381385
}
382386

383-
#if (JAVA_SPEC_VERSION == 8) && defined(WIN32)
384387
/* Do not remove: this method is required by Windows IBM Java 8 builds. */
385388
jobject JNICALL
386389
JVM_DoPrivileged(JNIEnv* env, jobject java_security_AccessController, jobject action, jboolean unknown, jboolean isExceptionAction)

0 commit comments

Comments
 (0)