--- a/src/hotspot/share/runtime/arguments.cpp Thu Mar 21 01:49:27 2019 +0100
+++ b/src/hotspot/share/runtime/arguments.cpp Wed Mar 20 23:32:57 2019 -0400
@@ -530,6 +530,7 @@
{ "UseMembar", JDK_Version::jdk(10), JDK_Version::jdk(12), JDK_Version::undefined() },
{ "CompilationPolicyChoice", JDK_Version::jdk(13), JDK_Version::jdk(14), JDK_Version::undefined() },
{ "FailOverToOldVerifier", JDK_Version::jdk(13), JDK_Version::jdk(14), JDK_Version::undefined() },
+ { "AllowJNIEnvProxy", JDK_Version::jdk(13), JDK_Version::jdk(14), JDK_Version::jdk(15) },
{ "ThreadLocalHandshakes", JDK_Version::jdk(13), JDK_Version::jdk(14), JDK_Version::jdk(15) },
// --- Deprecated alias flags (see also aliased_jvm_flags) - sorted by obsolete_in then expired_in:
--- a/src/hotspot/share/runtime/globals.hpp Thu Mar 21 01:49:27 2019 +0100
+++ b/src/hotspot/share/runtime/globals.hpp Wed Mar 20 23:32:57 2019 -0400
@@ -861,7 +861,7 @@
"by the application (Solaris & Linux only)") \
\
product(bool, AllowJNIEnvProxy, false, \
- "Allow JNIEnv proxies for jdbx") \
+ "(Deprecated) Allow JNIEnv proxies for jdbx") \
\
product(bool, RestoreMXCSROnJNICalls, false, \
"Restore MXCSR when returning from JNI calls") \
--- a/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java Thu Mar 21 01:49:27 2019 +0100
+++ b/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java Wed Mar 20 23:32:57 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -46,6 +46,7 @@
{"InitialRAMFraction", "64"},
{"TLABStats", "false"},
{"ThreadLocalHandshakes", "true"},
+ {"AllowJNIEnvProxy", "true"},
// deprecated alias flags (see also aliased_jvm_flags):
{"DefaultMaxRAMFraction", "4"},