# HG changeset patch
# User gadams
# Date 1540309863 14400
# Node ID 45e3d52aaced1390a65d35a34e5cd321bf71b63a
# Parent  750b500ef4debed7f569d776312c4d45cb9beaa3
8206330: Revisit com/sun/jdi/RedefineCrossEvent.java
Reviewed-by: cjplummer, sspitsyn, amenkov

diff -r 750b500ef4de -r 45e3d52aaced test/jdk/ProblemList.txt
--- a/test/jdk/ProblemList.txt	Thu Oct 18 15:56:37 2018 -0500
+++ b/test/jdk/ProblemList.txt	Tue Oct 23 11:51:03 2018 -0400
@@ -874,14 +874,6 @@
 
 ############################################################################
 
-###########################################################################
-#
-# Java EE Module Removal
-#
-com/sun/jdi/RedefineCrossEvent.java                             8194308    generic-all  Java EE Module Removal
-
-############################################################################
-
 # jdk_jfr
 
 jdk/jfr/event/io/TestInstrumentation.java                       8202142    generic-all
diff -r 750b500ef4de -r 45e3d52aaced test/jdk/com/sun/jdi/RedefineCrossEvent.java
--- a/test/jdk/com/sun/jdi/RedefineCrossEvent.java	Thu Oct 18 15:56:37 2018 -0500
+++ b/test/jdk/com/sun/jdi/RedefineCrossEvent.java	Tue Oct 23 11:51:03 2018 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, 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
@@ -27,9 +27,6 @@
  * @summary Test class redefinition at each event cross tested with other tests
  * @author Robert Field
  *
- * @modules java.corba
- *          jdk.jdi
- *
  * @run build TestScaffold VMConnection TargetAdapter TargetListener
  * @run compile -g AccessSpecifierTest.java
  * @run compile -g AfterThreadDeathTest.java
diff -r 750b500ef4de -r 45e3d52aaced test/jdk/com/sun/jdi/TestScaffold.java
--- a/test/jdk/com/sun/jdi/TestScaffold.java	Thu Oct 18 15:56:37 2018 -0500
+++ b/test/jdk/com/sun/jdi/TestScaffold.java	Tue Oct 23 11:51:03 2018 -0400
@@ -542,7 +542,9 @@
                                 redefine(mainStartClass);
                             }
                         } else {
-                            redefine(rt);
+                            if (!name.startsWith("jdk.")) {
+                                redefine(rt);
+                            }
                         }
                     }
                 }