--- a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Main.java Thu Feb 16 13:17:55 2017 +0300
+++ b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Main.java Thu Feb 16 11:26:14 2017 +0000
@@ -145,12 +145,14 @@
* in parseArgs, so that none of the arguments will be nulled
* before delegating to the new implementation.
*/
- for (int i = 0; i < argv.length; i++) {
- if (argv[i].equals("-Xnew")) {
- return (new sun.rmi.rmic.newrmic.Main(out,
- program)).compile(argv);
- }
- }
+ // disable the -Xnew option as per JDK-8146299 and JDK-8145980
+ // to allow further discussion how to progress with this feature
+ //for (int i = 0; i < argv.length; i++) {
+ // if (argv[i].equals("-Xnew")) {
+ // return (new sun.rmi.rmic.newrmic.Main(out,
+ // program)).compile(argv);
+ // }
+ //}
if (!parseArgs(argv)) {
return false;
--- a/jdk/test/ProblemList.txt Thu Feb 16 13:17:55 2017 +0300
+++ b/jdk/test/ProblemList.txt Thu Feb 16 11:26:14 2017 +0000
@@ -199,8 +199,6 @@
java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java 8169569 windows-all
-sun/rmi/rmic/newrmic/equivalence/run.sh 8145980 generic-all
-
java/rmi/registry/readTest/CodebaseTest.java 8173324 windows-all
############################################################################
--- a/jdk/test/sun/rmi/rmic/newrmic/equivalence/run.sh Thu Feb 16 13:17:55 2017 +0300
+++ b/jdk/test/sun/rmi/rmic/newrmic/equivalence/run.sh Thu Feb 16 11:26:14 2017 +0000
@@ -22,6 +22,8 @@
#
# @test
+# @ignore test is disabled, while further discussion on the rmic -Xnew feature
+# takes place (c.f JDK-8146299, JDK-8145980).
# @bug 4911536
# @summary This test verifies that the new implementation of rmic
# generates equivalent classes as the old implementation, for a set