8231995: two jtreg tests failed after 8229366 is fixed

Reviewed-by: jbachorik

src/share/classes/jdk/jfr/internal/JVMUpcalls.java

@@ -140,4 +140,13 @@ final class JVMUpcalls {
     static Thread createRecorderThread(ThreadGroup systemThreadGroup, ClassLoader contextClassLoader) {
         return SecuritySupport.createRecorderThread(systemThreadGroup, contextClassLoader);
     }
+
+    /**
+     * Called by the JVM to initialize the EventHandlerProxy class.
+     *
+     * @return the EventHandlerProxy class
+     */
+    static Class<? extends EventHandler> getEventHandlerProxyClass() {
+        return EventHandlerProxyCreator.proxyClass;
+    }
 }

src/share/lib/security/java.security-aix

@@ -276,7 +276,10 @@ package.definition=sun.,\
                    jdk.nashorn.internal.,\
                    jdk.nashorn.tools.,\
                    jdk.xml.internal.,\
-                   com.sun.activation.registries.
+                   com.sun.activation.registries.,\
+                   jdk.jfr.events.,\
+                   jdk.jfr.internal.,\
+                   jdk.management.jfr.internal.
 
 #
 # Determines whether this properties file can be appended to

src/share/lib/security/java.security-linux

@@ -276,7 +276,10 @@ package.definition=sun.,\
                    jdk.nashorn.internal.,\
                    jdk.nashorn.tools.,\
                    jdk.xml.internal.,\
-                   com.sun.activation.registries.
+                   com.sun.activation.registries.,\
+                   jdk.jfr.events.,\
+                   jdk.jfr.internal.,\
+                   jdk.management.jfr.internal.
 
 #
 # Determines whether this properties file can be appended to

src/share/lib/security/java.security-macosx

@@ -279,7 +279,10 @@ package.definition=sun.,\
                    jdk.nashorn.tools.,\
                    jdk.xml.internal.,\
                    com.sun.activation.registries.,\
-                   apple.
+                   apple.,\
+                   jdk.jfr.events.,\
+                   jdk.jfr.internal.,\
+                   jdk.management.jfr.internal.
 
 #
 # Determines whether this properties file can be appended to

src/share/lib/security/java.security-solaris

@@ -278,8 +278,10 @@ package.definition=sun.,\
                    jdk.nashorn.internal.,\
                    jdk.nashorn.tools.,\
                    jdk.xml.internal.,\
-                   com.sun.activation.registries.
-
+                   com.sun.activation.registries.,\
+                   jdk.jfr.events.,\
+                   jdk.jfr.internal.,\
+                   jdk.management.jfr.internal.
 #
 # Determines whether this properties file can be appended to
 # or overridden on the command line via -Djava.security.properties

src/share/lib/security/java.security-windows

@@ -279,7 +279,10 @@ package.definition=sun.,\
                    jdk.nashorn.tools.,\
                    jdk.xml.internal.,\
                    com.sun.activation.registries.,\
-                   com.sun.java.accessibility.
+                   com.sun.java.accessibility.,\
+                   jdk.jfr.events.,\
+                   jdk.jfr.internal.,\
+                   jdk.management.jfr.internal.
 
 #
 # Determines whether this properties file can be appended to

test/java/lang/SecurityManager/CheckPackageAccess.java

@@ -86,6 +86,9 @@ public class CheckPackageAccess {
         "oracle.jrockit.jfr.",
         "org.jcp.xml.dsig.internal.",
         "jdk.internal.",
+        "jdk.jfr.events.",
+        "jdk.jfr.internal.",
+        "jdk.management.jfr.internal.",
         "jdk.nashorn.internal.",
         "jdk.nashorn.tools.",
         "jdk.xml.internal.",

test/jdk/jfr/api/event/TestAbstractEvent.java

@@ -44,6 +44,7 @@ import jdk.test.lib.jfr.Events;
  *
  * @library /lib /
  * @run main/othervm jdk.jfr.api.event.TestAbstractEvent
+ * @run main/othervm -XX:+AllowParallelDefineClass jdk.jfr.api.event.TestAbstractEvent
  */
 public class TestAbstractEvent {
 

test/jdk/jfr/api/event/TestEventFactory.java

@@ -44,6 +44,7 @@ import jdk.test.lib.Asserts;
  *
  * @library /lib /
  * @run main/othervm jdk.jfr.api.event.TestEventFactory
+ * @run main/othervm -XX:+AllowParallelDefineClass jdk.jfr.api.event.TestEventFactory
  */
 public class TestEventFactory {
 

test/jdk/jfr/api/event/TestEventFactoryRegistration.java

@@ -44,6 +44,7 @@ import jdk.test.lib.Asserts;
  *
  * @library /lib /
  * @run main/othervm jdk.jfr.api.event.TestEventFactoryRegistration
+ * @run main/othervm -XX:+AllowParallelDefineClass jdk.jfr.api.event.TestEventFactoryRegistration
  */
 public class TestEventFactoryRegistration {
 

test/jdk/jfr/event/runtime/TestClassDefineEvent.java

@@ -43,6 +43,7 @@ import jdk.test.lib.jfr.TestClassLoader;
  * @library /lib /
  * @build jdk.jfr.event.runtime.TestClasses
  * @run main/othervm jdk.jfr.event.runtime.TestClassDefineEvent
+ * @run main/othervm -XX:+AllowParallelDefineClass jdk.jfr.event.runtime.TestClassDefineEvent
  */
 public final class TestClassDefineEvent {