Merge
authorlana
Thu, 16 Mar 2017 17:55:58 +0000
changeset 44277 2738ac02c964
parent 44214 a78c23a9555a (current diff)
parent 44276 ffb853d2c414 (diff)
child 44278 97b15fb56e83
child 44371 d5cba14e5550
Merge
--- a/corba/src/java.corba/share/classes/sun/corba/Bridge.java	Thu Mar 16 16:34:34 2017 +0000
+++ b/corba/src/java.corba/share/classes/sun/corba/Bridge.java	Thu Mar 16 17:55:58 2017 +0000
@@ -59,10 +59,10 @@
  * </ul>
  * The code that calls Bridge.get() must have the following Permissions:
  * <ul>
- * <li>RuntimePermission "reflectionFactoryAccess"</li>
  * <li>BridgePermission "getBridge"</li>
  * <li>ReflectPermission "suppressAccessChecks"</li>
- * <li>StackFramePermission "retainClassReference"</li>
+ * <li>RuntimePermission "getStackWalkerWithClassReference"</li>
+ * <li>RuntimePermission "reflectionFactoryAccess"</li>
  * </ul>
  * <p>
  * All of these permissions are required to obtain and correctly initialize
@@ -105,10 +105,10 @@
     /** Fetch the Bridge singleton.  This requires the following
      * permissions:
      * <ul>
-     * <li>RuntimePermission "reflectionFactoryAccess"</li>
      * <li>BridgePermission "getBridge"</li>
      * <li>ReflectPermission "suppressAccessChecks"</li>
-     * <li>StackFramePermission "retainClassReference"</li>
+     * <li>RuntimePermission "getStackWalkerWithClassReference"</li>
+     * <li>RuntimePermission "reflectionFactoryAccess"</li>
      * </ul>
      * @return The singleton instance of the Bridge class
      * @throws SecurityException if the caller does not have the