From a141b69c1b6be5d3d70787f191d273c8be020bd7 Mon Sep 17 00:00:00 2001
From: Mark Sheppard <msheppar@openjdk.org>
Date: Thu, 16 Feb 2017 11:26:14 +0000
Subject: [PATCH] 8146299: Disable rmic -Xnew

Reviewed-by: chegar, smarks, rriggs, mchung
---
 .../jdk.rmic/share/classes/sun/rmi/rmic/Main.java  | 14 ++++++++------
 jdk/test/ProblemList.txt                           |  2 --
 jdk/test/sun/rmi/rmic/newrmic/equivalence/run.sh   |  2 ++
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Main.java b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Main.java
index 288ad5270b8..938d8dc8cba 100644
--- a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Main.java
+++ b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Main.java
@@ -145,12 +145,14 @@ public class Main implements sun.rmi.rmic.Constants {
          * 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;
diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index 518f9c77457..15dc8b7fe0b 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -199,8 +199,6 @@ java/rmi/activation/Activatable/extLoadedImpl/ext.sh            8062724 generic-
 
 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
 
 ############################################################################
diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/run.sh b/jdk/test/sun/rmi/rmic/newrmic/equivalence/run.sh
index 27c86041414..a2e84bc116b 100644
--- a/jdk/test/sun/rmi/rmic/newrmic/equivalence/run.sh
+++ b/jdk/test/sun/rmi/rmic/newrmic/equivalence/run.sh
@@ -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