Google Git
Sign in
apache/netbeans/refs/heads/cleanup_getSecurityManager_usage^!/.
commit
b355a3edd08dba9520985f3268573115db823b67
[log]
author
Brad Walker <bwalker@musings.com>
Mon Dec 22 21:07:05 2025 -0700
committer
Brad Walker <bwalker@musings.com>
Mon Dec 22 21:07:05 2025 -0700
tree
11a1834cc93f1f424f262ff2bbc2dfc8d75bc722
parent
dbea0b6d26ab645c756b82a985d0e434bee1fcb0 [diff]
cleanup: cleanup usage of getSecurityManager()

desc: getSecurityManager() is deprecated and marked for imminent removal. In addition as of JDK 24, getSecurityManager() returns null.

This change removes getSecurityManager() from various places that have minimal impact.

diff --git a/enterprise/performance.scripting/test/qa-functional/src/org/netbeans/performance/languages/actions/CountingSecurityManager.java b/enterprise/performance.scripting/test/qa-functional/src/org/netbeans/performance/languages/actions/CountingSecurityManager.java
index 652cc2f..b9f6b67 100644
--- a/enterprise/performance.scripting/test/qa-functional/src/org/netbeans/performance/languages/actions/CountingSecurityManager.java
+++ b/enterprise/performance.scripting/test/qa-functional/src/org/netbeans/performance/languages/actions/CountingSecurityManager.java

@@ -51,11 +51,10 @@
     public static void initialize(String prefix) {
         Assert.assertNotNull(prefix);
         
-        if (! (System.getSecurityManager() instanceof CountingSecurityManager)) {
-            setAllowedReplace(true);
-            System.setSecurityManager(new CountingSecurityManager());
-            setAllowedReplace(false);
-        }
+        setAllowedReplace(true);
+        System.setSecurityManager(new CountingSecurityManager());
+        setAllowedReplace(false);
+
         if (!System.getSecurityManager().getClass().getName().equals(CountingSecurityManager.class.getName())) {
             throw new IllegalStateException("Wrong security manager: " + System.getSecurityManager());
         }

diff --git a/ide/ide.kit/test/qa-functional/src/org/netbeans/test/ide/CountingSecurityManager.java b/ide/ide.kit/test/qa-functional/src/org/netbeans/test/ide/CountingSecurityManager.java
index 45b65e5..361eb69 100755
--- a/ide/ide.kit/test/qa-functional/src/org/netbeans/test/ide/CountingSecurityManager.java
+++ b/ide/ide.kit/test/qa-functional/src/org/netbeans/test/ide/CountingSecurityManager.java

@@ -90,11 +90,7 @@
     public static void initialize(String prefix, Mode mode, Set<String> allowedFiles) {
         System.setProperty("counting.security.disabled", "true");
 
-        if (System.getSecurityManager() instanceof CountingSecurityManager) {
-            // ok
-        } else {
-            System.setSecurityManager(new CountingSecurityManager());
-        }
+        System.setSecurityManager(new CountingSecurityManager());
         setCnt(0);
         msgs = new StringWriter();
         pw = new PrintWriter(msgs);
@@ -113,7 +109,6 @@
     static void assertReflection(int maxCount, String whitelist) {
         System.setProperty("counting.reflection.whitelist", whitelist);
         RuntimePermission checkMemberAccessPermission = new RuntimePermission("accessDeclaredMembers");
-        System.getSecurityManager().checkPermission(checkMemberAccessPermission);
         System.getProperties().remove("counting.reflection.whitelist");
     }
 
@@ -127,7 +122,7 @@
     }
 
     public static boolean isEnabled() {
-        return System.getSecurityManager() instanceof Callable<?>;
+        return false;
     }
     
     public static void assertCounts(String msg, int expectedCnt) throws Exception {

diff --git a/ide/projectui/src/org/netbeans/modules/project/ui/groups/CheckBoxRenderrer.java b/ide/projectui/src/org/netbeans/modules/project/ui/groups/CheckBoxRenderrer.java
index d0628fd..6a1750a 100644
--- a/ide/projectui/src/org/netbeans/modules/project/ui/groups/CheckBoxRenderrer.java
+++ b/ide/projectui/src/org/netbeans/modules/project/ui/groups/CheckBoxRenderrer.java

@@ -49,19 +49,11 @@
 
     private Border getNoFocusBorder () {
         Border border = UIManager.getBorder("List.cellNoFocusBorder");
-        if (System.getSecurityManager () != null) {
-            if (border != null) {
-                return border;
-            }
-            return SAFE_NO_FOCUS_BORDER;
-        } else {
-            if (border != null &&
-                (noFocusBorder == null ||
-                noFocusBorder == DEFAULT_NO_FOCUS_BORDER)) {
-                return border;
-            }
-            return noFocusBorder;
+        if (border != null &&
+            (noFocusBorder == null || noFocusBorder == DEFAULT_NO_FOCUS_BORDER)) {
+            return border;
         }
+        return noFocusBorder;
     }
 
     public Component getListCellRendererComponent (

diff --git a/ide/spellchecker/src/org/netbeans/modules/spellchecker/options/CheckBoxRenderrer.java b/ide/spellchecker/src/org/netbeans/modules/spellchecker/options/CheckBoxRenderrer.java
index 02f7706..5a434e2 100644
--- a/ide/spellchecker/src/org/netbeans/modules/spellchecker/options/CheckBoxRenderrer.java
+++ b/ide/spellchecker/src/org/netbeans/modules/spellchecker/options/CheckBoxRenderrer.java

@@ -49,19 +49,11 @@
 
     private Border getNoFocusBorder () {
         Border border = UIManager.getBorder("List.cellNoFocusBorder");
-        if (System.getSecurityManager () != null) {
-            if (border != null) {
-                return border;
-            }
-            return SAFE_NO_FOCUS_BORDER;
-        } else {
-            if (border != null &&
-                (noFocusBorder == null ||
-                noFocusBorder == DEFAULT_NO_FOCUS_BORDER)) {
-                return border;
-            }
-            return noFocusBorder;
+        if (border != null &&
+            (noFocusBorder == null || noFocusBorder == DEFAULT_NO_FOCUS_BORDER)) {
+            return border;
         }
+        return noFocusBorder;
     }
 
     public Component getListCellRendererComponent (

diff --git a/ide/versioning/test/unit/src/org/netbeans/modules/versioning/GetOwnerTest.java b/ide/versioning/test/unit/src/org/netbeans/modules/versioning/GetOwnerTest.java
index 7b46423..ba531213 100644
--- a/ide/versioning/test/unit/src/org/netbeans/modules/versioning/GetOwnerTest.java
+++ b/ide/versioning/test/unit/src/org/netbeans/modules/versioning/GetOwnerTest.java

@@ -37,7 +37,6 @@
     
     protected File dataRootDir;
     private StatFiles accessMonitor;
-    private SecurityManager defaultSecurityManager;
     protected File versionedFolder;
     protected File unversionedFolder;
 
@@ -69,9 +68,6 @@
         userdir.mkdirs();
         System.setProperty("netbeans.user", userdir.getAbsolutePath());
         if(accessMonitor != null) {
-            if(defaultSecurityManager == null) {
-                defaultSecurityManager = System.getSecurityManager();
-            }
             System.setSecurityManager(accessMonitor);
         }
     }
@@ -80,7 +76,8 @@
     protected void tearDown() throws Exception {
         super.tearDown();
         if(accessMonitor != null) {
-            System.setSecurityManager(defaultSecurityManager);
+            // FIXME - throws UnsupportedOperationException unconditionally, regardless of arg.
+            System.setSecurityManager(null);
         }
     }
      

diff --git a/java/java.navigation/src/org/netbeans/modules/java/stackanalyzer/AnalyserCellRenderer.java b/java/java.navigation/src/org/netbeans/modules/java/stackanalyzer/AnalyserCellRenderer.java
index 44d0641..4b0eb5a 100644
--- a/java/java.navigation/src/org/netbeans/modules/java/stackanalyzer/AnalyserCellRenderer.java
+++ b/java/java.navigation/src/org/netbeans/modules/java/stackanalyzer/AnalyserCellRenderer.java

@@ -42,17 +42,11 @@
 
     private Border getNoFocusBorder() {
         Border border = UIManager.getBorder("List.cellNoFocusBorder");
-        if (System.getSecurityManager() != null) {
-            if (border != null) return border;
-            return SAFE_NO_FOCUS_BORDER;
-        } else {
-            if (border != null &&
-                    (noFocusBorder == null ||
-                    noFocusBorder == DEFAULT_NO_FOCUS_BORDER)) {
-                return border;
-            }
-            return noFocusBorder;
+        if (border != null &&
+            (noFocusBorder == null || noFocusBorder == DEFAULT_NO_FOCUS_BORDER)) {
+            return border;
         }
+        return noFocusBorder;
     }
 
 

diff --git a/java/java.source.base/test/unit/src/org/netbeans/api/java/source/TreePathHandleTest.java b/java/java.source.base/test/unit/src/org/netbeans/api/java/source/TreePathHandleTest.java
index 950c9fa..987de39 100644
--- a/java/java.source.base/test/unit/src/org/netbeans/api/java/source/TreePathHandleTest.java
+++ b/java/java.source.base/test/unit/src/org/netbeans/api/java/source/TreePathHandleTest.java

@@ -184,13 +184,12 @@
                 
                 TypeElement string = parameter.getElements().getTypeElement("test.test2");
                 
-                SecurityManager old = System.getSecurityManager();
-                
                 System.setSecurityManager(new SecMan());
                 
                 TreePathHandle.create(string, parameter);
-                
-                System.setSecurityManager(old);
+
+                // FIXME - throws UnsupportedOperationException unconditionally, regardless of arg.
+		System.setSecurityManager(null);
             }
         }, true);
     }

diff --git a/java/performance.java/test/qa-functional/src/org/netbeans/performance/j2se/actions/CountingSecurityManager.java b/java/performance.java/test/qa-functional/src/org/netbeans/performance/j2se/actions/CountingSecurityManager.java
index 64a0483..2bd2017 100644
--- a/java/performance.java/test/qa-functional/src/org/netbeans/performance/j2se/actions/CountingSecurityManager.java
+++ b/java/performance.java/test/qa-functional/src/org/netbeans/performance/j2se/actions/CountingSecurityManager.java

@@ -50,14 +50,10 @@
     public static void initialize(String prefix) {
         Assert.assertNotNull(prefix);
         
-        if (! (System.getSecurityManager() instanceof CountingSecurityManager)) {
-            setAllowedReplace(true);
-            System.setSecurityManager(new CountingSecurityManager());
-            setAllowedReplace(false);
-        }
-        if (!System.getSecurityManager().getClass().getName().equals(CountingSecurityManager.class.getName())) {
-            throw new IllegalStateException("Wrong security manager: " + System.getSecurityManager());
-        }
+        setAllowedReplace(true);
+        System.setSecurityManager(new CountingSecurityManager());
+        setAllowedReplace(false);
+
         cnt = 0;
         msgs = new StringWriter();
         pw = new PrintWriter(msgs);

diff --git a/java/performance/test/qa-functional/src/org/netbeans/test/ide/PerfCountingSecurityManager.java b/java/performance/test/qa-functional/src/org/netbeans/test/ide/PerfCountingSecurityManager.java
index dcd3b28..17dd919 100644
--- a/java/performance/test/qa-functional/src/org/netbeans/test/ide/PerfCountingSecurityManager.java
+++ b/java/performance/test/qa-functional/src/org/netbeans/test/ide/PerfCountingSecurityManager.java

@@ -91,11 +91,7 @@
     public static void initialize(String prefix, PerfCountingSecurityManager.Mode mode, Set<String> allowedFiles) {
         System.setProperty("counting.security.disabled", "true");
 
-        if (System.getSecurityManager() instanceof PerfCountingSecurityManager) {
-            // ok
-        } else {
-            System.setSecurityManager(new PerfCountingSecurityManager());
-        }
+        System.setSecurityManager(new PerfCountingSecurityManager());
         setCnt(0);
         msgs = new StringWriter();
         pw = new PrintWriter(msgs);
@@ -113,7 +109,6 @@
 
     static void assertReflection(int maxCount, String whitelist) {
         System.setProperty("counting.reflection.whitelist", whitelist);
-        System.getSecurityManager().checkPermission( SecurityConstants.CHECK_MEMBER_ACCESS_PERMISSION); 
         System.getProperties().remove("counting.reflection.whitelist");
     }
 
@@ -127,7 +122,7 @@
     }
 
     public static boolean isEnabled() {
-        return System.getSecurityManager() instanceof Callable<?>;
+        return false;
     }
     
     public static void assertCounts(String msg, int expectedCnt) throws Exception {

diff --git a/java/performance/test/unit/src/org/netbeans/performance/scalability/CountingSecurityManager.java b/java/performance/test/unit/src/org/netbeans/performance/scalability/CountingSecurityManager.java
index 0a42eb5..3266082 100644
--- a/java/performance/test/unit/src/org/netbeans/performance/scalability/CountingSecurityManager.java
+++ b/java/performance/test/unit/src/org/netbeans/performance/scalability/CountingSecurityManager.java

@@ -51,14 +51,10 @@
     public static void initialize(String prefix) {
         Assert.assertNotNull(prefix);
         
-        if (! (System.getSecurityManager() instanceof CountingSecurityManager)) {
-            setAllowedReplace(true);
-            System.setSecurityManager(new CountingSecurityManager());
-            setAllowedReplace(false);
-        }
-        if (!System.getSecurityManager().getClass().getName().equals(CountingSecurityManager.class.getName())) {
-            throw new IllegalStateException("Wrong security manager: " + System.getSecurityManager());
-        }
+        setAllowedReplace(true);
+        System.setSecurityManager(new CountingSecurityManager());
+        setAllowedReplace(false);
+
         cnt = 0;
         msgs = new StringWriter();
         pw = new PrintWriter(msgs);

diff --git a/platform/core.startup/test/unit/src/org/netbeans/core/startup/CountingSecurityManager.java b/platform/core.startup/test/unit/src/org/netbeans/core/startup/CountingSecurityManager.java
index fd6ac88..7b3ef66 100644
--- a/platform/core.startup/test/unit/src/org/netbeans/core/startup/CountingSecurityManager.java
+++ b/platform/core.startup/test/unit/src/org/netbeans/core/startup/CountingSecurityManager.java

@@ -36,11 +36,7 @@
     private static String prefix;
     
     public static void initialize(String prefix) {
-        if (System.getSecurityManager() instanceof CountingSecurityManager) {
-            // ok
-        } else {
-            System.setSecurityManager(new CountingSecurityManager());
-        }
+        System.setSecurityManager(new CountingSecurityManager());
         cnt = 0;
         msgs = new StringWriter();
         pw = new PrintWriter(msgs);

diff --git a/platform/core.startup/test/unit/src/org/netbeans/core/startup/IsDirCntSecurityManager.java b/platform/core.startup/test/unit/src/org/netbeans/core/startup/IsDirCntSecurityManager.java
index 12a02eb..528704c 100644
--- a/platform/core.startup/test/unit/src/org/netbeans/core/startup/IsDirCntSecurityManager.java
+++ b/platform/core.startup/test/unit/src/org/netbeans/core/startup/IsDirCntSecurityManager.java

@@ -32,9 +32,7 @@
     private static StringBuffer sb;
 
     public static void initialize() {
-        if (!(System.getSecurityManager() instanceof IsDirCntSecurityManager)) {
-            System.setSecurityManager(new IsDirCntSecurityManager());
-        }
+        System.setSecurityManager(new IsDirCntSecurityManager());
         cnt = 0;
         sb = new StringBuffer();
     }

diff --git a/platform/core.startup/test/unit/src/org/netbeans/core/startup/layers/CountingSecurityManager.java b/platform/core.startup/test/unit/src/org/netbeans/core/startup/layers/CountingSecurityManager.java
index ed12ee2..5758f4a 100644
--- a/platform/core.startup/test/unit/src/org/netbeans/core/startup/layers/CountingSecurityManager.java
+++ b/platform/core.startup/test/unit/src/org/netbeans/core/startup/layers/CountingSecurityManager.java

@@ -67,11 +67,7 @@
         System.setProperty("counting.security.disabled", "true");
         inSubtree("", "");
 
-        if (System.getSecurityManager() instanceof CountingSecurityManager) {
-            // ok
-        } else {
-            System.setSecurityManager(new CountingSecurityManager());
-        }
+        System.setSecurityManager(new CountingSecurityManager());
         setCnt(0);
         msgs = new StringWriter();
         pw = new PrintWriter(msgs);
@@ -86,7 +82,6 @@
 
     static void assertReflection(int maxCount, String whitelist) {
         System.setProperty("counting.reflection.whitelist", whitelist);
-        System.getSecurityManager().checkPermission(new MaxCountCheck(maxCount, "MaxCountCheck"));
         System.getProperties().remove("counting.reflection.whitelist");
     }
 
@@ -129,7 +124,7 @@
     }
 
     public static boolean isEnabled() {
-        return System.getSecurityManager() instanceof Callable<?>;
+        return false
     }
     
     public static void assertCounts(String msg, int expectedCnt) throws Exception {

diff --git a/platform/netbinox/test/unit/src/org/netbeans/modules/netbinox/CountingSecurityManager.java b/platform/netbinox/test/unit/src/org/netbeans/modules/netbinox/CountingSecurityManager.java
index 608d1d9..b461497 100644
--- a/platform/netbinox/test/unit/src/org/netbeans/modules/netbinox/CountingSecurityManager.java
+++ b/platform/netbinox/test/unit/src/org/netbeans/modules/netbinox/CountingSecurityManager.java

@@ -60,11 +60,7 @@
     public static void initialize(String prefix, Mode mode, Set<String> allowedFiles) {
         System.setProperty("counting.security.disabled", "true");
 
-        if (System.getSecurityManager() instanceof CountingSecurityManager) {
-            // ok
-        } else {
-            System.setSecurityManager(new CountingSecurityManager());
-        }
+        System.setSecurityManager(new CountingSecurityManager());
         setCnt(0);
         msgs = new StringWriter();
         pw = new PrintWriter(msgs);
@@ -79,7 +75,6 @@
 
     static void assertReflection(int maxCount, String whitelist) {
         System.setProperty("counting.reflection.whitelist", whitelist);
-        System.getSecurityManager().checkPermission(new MaxCountPerm(maxCount));
         System.getProperties().remove("counting.reflection.whitelist");
     }
 
@@ -124,7 +119,7 @@
     }
 
     public static boolean isEnabled() {
-        return System.getSecurityManager() instanceof Callable<?>;
+        return false;
     }
     
     public static void assertCounts(String msg, int expectedCnt) throws Exception {

diff --git a/platform/o.n.bootstrap/test/unit/src/org/netbeans/CountingSecurityManager.java b/platform/o.n.bootstrap/test/unit/src/org/netbeans/CountingSecurityManager.java
index d29eb16..7a54ce8 100644
--- a/platform/o.n.bootstrap/test/unit/src/org/netbeans/CountingSecurityManager.java
+++ b/platform/o.n.bootstrap/test/unit/src/org/netbeans/CountingSecurityManager.java

@@ -36,11 +36,7 @@
     private static String prefix;
     
     public static void initialize(String prefix) {
-        if (System.getSecurityManager() instanceof CountingSecurityManager) {
-            // ok
-        } else {
-            System.setSecurityManager(new CountingSecurityManager());
-        }
+        System.setSecurityManager(new CountingSecurityManager());
         cnt = 0;
         msgs = new StringWriter();
         pw = new PrintWriter(msgs);

diff --git a/platform/o.n.bootstrap/test/unit/src/org/netbeans/JarClassLoaderTest.java b/platform/o.n.bootstrap/test/unit/src/org/netbeans/JarClassLoaderTest.java
index 0a60359..73e2ea9 100644
--- a/platform/o.n.bootstrap/test/unit/src/org/netbeans/JarClassLoaderTest.java
+++ b/platform/o.n.bootstrap/test/unit/src/org/netbeans/JarClassLoaderTest.java

@@ -407,11 +407,7 @@
         public static void initialize(String path, Semaphore sync) {
             BlockingSecurityManager.path = path;
             BlockingSecurityManager.sync = sync;
-            if (System.getSecurityManager() instanceof BlockingSecurityManager) {
-            // ok
-            } else {
-                System.setSecurityManager(new BlockingSecurityManager());
-            }
+            System.setSecurityManager(new BlockingSecurityManager());
         }
     
         public @Override void checkRead(String file) {

diff --git a/platform/openide.filesystems/test/unit/src/org/openide/filesystems/TestBaseHid.java b/platform/openide.filesystems/test/unit/src/org/openide/filesystems/TestBaseHid.java
index 029b9db..b14d886 100644
--- a/platform/openide.filesystems/test/unit/src/org/openide/filesystems/TestBaseHid.java
+++ b/platform/openide.filesystems/test/unit/src/org/openide/filesystems/TestBaseHid.java

@@ -76,9 +76,6 @@
         if (allTestedFS != null) testedFS = allTestedFS[0];
         // If not null, file accesses are counted through custom SecurityManager.
         if(accessMonitor != null) {
-            if(defaultSecurityManager == null) {
-                defaultSecurityManager = System.getSecurityManager();
-            }
             System.setSecurityManager(accessMonitor);
         }
     }

diff --git a/platform/openide.filesystems/test/unit/src/org/openide/filesystems/test/StatFiles.java b/platform/openide.filesystems/test/unit/src/org/openide/filesystems/test/StatFiles.java
index 6fab0f3..4e7b3e5 100644
--- a/platform/openide.filesystems/test/unit/src/org/openide/filesystems/test/StatFiles.java
+++ b/platform/openide.filesystems/test/unit/src/org/openide/filesystems/test/StatFiles.java

@@ -40,23 +40,17 @@
     public static final int DELETE = 3;
     private Results results;
     private Monitor monitor;
-    private SecurityManager defaultSecurityManager;
 
     public StatFiles() {
         reset();
     }
 
     public void register() {
-        if (defaultSecurityManager == null) {
-            defaultSecurityManager = System.getSecurityManager();
-        }
         System.setSecurityManager(this);
     }
     
     public void unregister() {
-        if (defaultSecurityManager == null) {
-            System.setSecurityManager(defaultSecurityManager);
-        }
+        System.setSecurityManager(null);
     }
     
     public void reset() {

diff --git a/platform/openide.util.ui/test/unit/src/org/openide/xml/XMLUtilReflectionTest.java b/platform/openide.util.ui/test/unit/src/org/openide/xml/XMLUtilReflectionTest.java
index 7caedcf..56b5964 100644
--- a/platform/openide.util.ui/test/unit/src/org/openide/xml/XMLUtilReflectionTest.java
+++ b/platform/openide.util.ui/test/unit/src/org/openide/xml/XMLUtilReflectionTest.java

@@ -97,11 +97,7 @@
     
     static final class CountingSecurityManager extends SecurityManager {
         public static void initialize() {
-            if (System.getSecurityManager() instanceof CountingSecurityManager) {
-                // ok
-            } else {
-                System.setSecurityManager(new CountingSecurityManager());
-            }
+            System.setSecurityManager(new CountingSecurityManager());
             members.clear();
         }