changeset 4470:5660157312a0

Merge
author asaha
date Thu, 22 Sep 2011 08:29:57 -0700
parents eb2569cfcdab 2d10aa9d772a
children 0d06c9ddd340
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/rmi/registry/RegistryImpl.java	Wed Sep 21 13:39:35 2011 -0700
+++ b/src/share/classes/sun/rmi/registry/RegistryImpl.java	Thu Sep 22 08:29:57 2011 -0700
@@ -418,6 +418,8 @@
          */
         perms.add(new SocketPermission("*", "connect,accept"));
 
+        perms.add(new RuntimePermission("accessClassInPackage.sun.*"));
+
         // add permissions required to load from codebase URL path
         LoaderHandler.addPermissionsForURLs(urls, perms, false);
 
--- a/test/sun/tools/jstatd/jstatdExternalRegistry.sh	Wed Sep 21 13:39:35 2011 -0700
+++ b/test/sun/tools/jstatd/jstatdExternalRegistry.sh	Thu Sep 22 08:29:57 2011 -0700
@@ -22,7 +22,7 @@
 #
 
 # @test
-# @bug 4990825
+# @bug 4990825 7092186
 # @run shell/timeout=90 jstatdExternalRegistry.sh
 # @summary Test functionality of 'jstatd -p<port>&' with an external RMI registry