WIP: 8342998: Remove all uses of AccessControlException

Need to update once doPriv is removed
kevinrushforth · Oct 30, 2024 · 2261aaf · 2261aaf
1 parent 082845b
commit 2261aaf
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/css/StyleManager.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/StyleManager.java
@@ -948,6 +948,8 @@ static byte[] calculateCheckSum(String fname) {
 
     @SuppressWarnings("removal")
     public static Stylesheet loadStylesheet(final String fname) {
+        // KCR: FIXME: Remove the try / catch -- the entire body of the catch
+        // is unreachable without a security manager
         try {
             return loadStylesheetUnPrivileged(fname);
         } catch (java.security.AccessControlException ace) {

diff --git a/modules/javafx.web/src/main/java/com/sun/webkit/network/HTTP2Loader.java b/modules/javafx.web/src/main/java/com/sun/webkit/network/HTTP2Loader.java
@@ -51,7 +51,6 @@
 import java.net.http.HttpResponse;
 import java.net.http.HttpTimeoutException;
 import java.nio.ByteBuffer;
-import java.security.AccessControlException;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.time.Duration;
@@ -576,8 +575,6 @@ private Void didFail(final Throwable th) {
                 throw th;
             } catch (MalformedURLException ex) {
                 errorCode = LoadListenerClient.MALFORMED_URL;
-            } catch (@SuppressWarnings("removal") AccessControlException ex) {
-                errorCode = LoadListenerClient.PERMISSION_DENIED;
             } catch (UnknownHostException ex) {
                 errorCode = LoadListenerClient.UNKNOWN_HOST;
             } catch (NoRouteToHostException ex) {

diff --git a/modules/javafx.web/src/main/java/com/sun/webkit/network/URLLoader.java b/modules/javafx.web/src/main/java/com/sun/webkit/network/URLLoader.java
@@ -51,7 +51,6 @@
 import java.net.URLDecoder;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
-import java.security.AccessControlException;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.List;
@@ -186,9 +185,6 @@ private void doRun() {
         } catch (MalformedURLException ex) {
             error = ex;
             errorCode = LoadListenerClient.MALFORMED_URL;
-        } catch (@SuppressWarnings("removal") AccessControlException ex) {
-            error = ex;
-            errorCode = LoadListenerClient.PERMISSION_DENIED;
         } catch (UnknownHostException ex) {
             error = ex;
             errorCode = LoadListenerClient.UNKNOWN_HOST;