Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8202143: Parts of 8193435 added in merge change set.
authordmarkov
Tue, 24 Apr 2018 11:39:04 +0100
changeset 50003 e2d4ac45fe36
parent 50002 4fad1003357f
child 50004 b6f4bd0bf173
8202143: Parts of 8193435 added in merge change set. Reviewed-by: serb, prr
src/java.desktop/share/classes/java/awt/Toolkit.java file | annotate | diff | comparison | revisions 
--- a/src/java.desktop/share/classes/java/awt/Toolkit.java	Mon Apr 23 14:06:46 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/Toolkit.java	Tue Apr 24 11:39:04 2018 +0100
@@ -678,11 +678,6 @@
      * If the connection to the specified URL requires
      * either {@code URLPermission} or {@code SocketPermission},
      * then {@code URLPermission} is used for security checks.
-     * For compatibility with pre-1.2 security managers, if the access
-     * is denied with {@code FilePermission} or {@code SocketPermission},
-     * the method throws the {@code SecurityException}
-     * if the corresponding 1.1-style SecurityManager.checkXXX method
-     * also denies permission.
      * @param     url   the URL to use in fetching the pixel data.
      * @return    an image which gets its pixel data from
      *                         the specified URL.
@@ -724,11 +719,6 @@
      * If the connection to the specified URL requires
      * either {@code URLPermission} or {@code SocketPermission},
      * then {@code URLPermission} is used for security checks.
-     * For compatibility with pre-1.2 security managers, if the access
-     * is denied with {@code FilePermission} or {@code SocketPermission},
-     * the method throws {@code SecurityException}
-     * if the corresponding 1.1-style SecurityManager.checkXXX method
-     * also denies permission.
      * @param     url   the URL to use in fetching the pixel data.
      * @return    an image which gets its pixel data from
      *                         the specified URL.
jdk-sandbox