You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by bw...@apache.org on 2025/12/23 05:05:15 UTC
(netbeans) branch cleanup_getSecurityManager_usage updated (91f4aa6a025 -> b355a3edd08)
This is an automated email from the ASF dual-hosted git repository.
bwalker pushed a change to branch cleanup_getSecurityManager_usage
in repository https://gitbox.apache.org/repos/asf/netbeans.git
omit 91f4aa6a025 cleanup: cleanup usage of getSecurityManager()
new b355a3edd08 cleanup: cleanup usage of getSecurityManager()
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (91f4aa6a025)
\
N -- N -- N refs/heads/cleanup_getSecurityManager_usage (b355a3edd08)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../memory/MeasureBaselineMemoryFootprint.java | 1 +
.../src/org/netbeans/junit/MemoryMeasurement.java | 4 +++-
.../TerminalLocalNativeProcess.java | 2 +-
.../modules/nativeexecution/api/HostInfo.java | 6 ++++-
.../nativeexecution/api/pty/PtySupport.java | 2 ++
.../api/util/HelperLibraryUtility.java | 2 ++
.../api/util/MacroExpanderFactory.java | 10 +++++++-
.../nativeexecution/api/util/Md5checker.java | 5 ++++
.../modules/nativeexecution/pty/IOConnector.java | 27 +++++++++++++++++++++-
.../nativeexecution/pty/NbStartUtility.java | 1 +
.../signals/impl/NbKillAllSignalSupport.java | 1 +
.../utilities/MemoryFootprintTestCase.java | 2 ++
.../startup/PlatformDependencySatisfiedTest.java | 14 +++++++++++
.../src/org/netbeans/swing/plaf/Startup.java | 10 +++++++-
.../beanstubs/org/openide/util/Utilities.java | 4 ++++
.../src/org/openide/util/BaseUtilities.java | 4 ++++
.../modules/quicksearch/SearchResultRender.java | 8 +++++++
.../org/netbeans/lib/profiler/global/Platform.java | 9 ++++++++
18 files changed, 106 insertions(+), 6 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
(netbeans) 01/01: cleanup: cleanup usage of getSecurityManager()
Posted by bw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bwalker pushed a commit to branch cleanup_getSecurityManager_usage
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit b355a3edd08dba9520985f3268573115db823b67
Author: Brad Walker <bw...@musings.com>
AuthorDate: Mon Dec 22 21:07:05 2025 -0700
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.
---
.../languages/actions/CountingSecurityManager.java | 9 ++++-----
.../org/netbeans/test/ide/CountingSecurityManager.java | 9 ++-------
.../modules/project/ui/groups/CheckBoxRenderrer.java | 16 ++++------------
.../modules/spellchecker/options/CheckBoxRenderrer.java | 16 ++++------------
.../org/netbeans/modules/versioning/GetOwnerTest.java | 7 ++-----
.../modules/java/stackanalyzer/AnalyserCellRenderer.java | 14 ++++----------
.../org/netbeans/api/java/source/TreePathHandleTest.java | 7 +++----
.../j2se/actions/CountingSecurityManager.java | 12 ++++--------
.../netbeans/test/ide/PerfCountingSecurityManager.java | 9 ++-------
.../performance/scalability/CountingSecurityManager.java | 12 ++++--------
.../netbeans/core/startup/CountingSecurityManager.java | 6 +-----
.../netbeans/core/startup/IsDirCntSecurityManager.java | 4 +---
.../core/startup/layers/CountingSecurityManager.java | 9 ++-------
.../modules/netbinox/CountingSecurityManager.java | 9 ++-------
.../unit/src/org/netbeans/CountingSecurityManager.java | 6 +-----
.../test/unit/src/org/netbeans/JarClassLoaderTest.java | 6 +-----
.../unit/src/org/openide/filesystems/TestBaseHid.java | 3 ---
.../unit/src/org/openide/filesystems/test/StatFiles.java | 8 +-------
.../unit/src/org/openide/xml/XMLUtilReflectionTest.java | 6 +-----
19 files changed, 43 insertions(+), 125 deletions(-)
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 652cc2fdb83..b9f6b674f2c 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 final class CountingSecurityManager extends SecurityManager {
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 45b65e53bbb..361eb697bab 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 @@ final class CountingSecurityManager extends SecurityManager implements Callable<
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 @@ final class CountingSecurityManager extends SecurityManager implements Callable<
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 @@ final class CountingSecurityManager extends SecurityManager implements Callable<
}
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 d0628fd4d40..6a1750ab523 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 @@ public class CheckBoxRenderrer extends JCheckBox implements ListCellRenderer, Se
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 02f7706a8c3..5a434e2987b 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 @@ public class CheckBoxRenderrer extends JCheckBox implements ListCellRenderer, Se
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 7b464230622..ba531213ac0 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 @@ public class GetOwnerTest extends NbTestCase {
protected File dataRootDir;
private StatFiles accessMonitor;
- private SecurityManager defaultSecurityManager;
protected File versionedFolder;
protected File unversionedFolder;
@@ -69,9 +68,6 @@ public class GetOwnerTest extends NbTestCase {
userdir.mkdirs();
System.setProperty("netbeans.user", userdir.getAbsolutePath());
if(accessMonitor != null) {
- if(defaultSecurityManager == null) {
- defaultSecurityManager = System.getSecurityManager();
- }
System.setSecurityManager(accessMonitor);
}
}
@@ -80,7 +76,8 @@ public class GetOwnerTest extends NbTestCase {
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 44d0641fafc..4b0eb5a52af 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 @@ class AnalyserCellRenderer extends DefaultListCellRenderer {
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 950c9fa6afc..987de39fd3c 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 @@ public class TreePathHandleTest extends NbTestCase {
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 64a04837c34..2bd2017d2ae 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 final class CountingSecurityManager extends SecurityManager {
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 dcd3b28cead..17dd919c1a7 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 @@ final class PerfCountingSecurityManager extends SecurityManager implements Calla
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 @@ final class PerfCountingSecurityManager extends SecurityManager implements Calla
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 @@ final class PerfCountingSecurityManager extends SecurityManager implements Calla
}
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 0a42eb5166e..32660829db7 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 final class CountingSecurityManager extends SecurityManager {
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 fd6ac88fb24..7b3ef66e437 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 @@ final class CountingSecurityManager extends SecurityManager {
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 12a02eb2aee..528704c97d9 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 @@ public class IsDirCntSecurityManager extends SecurityManager {
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 ed12ee2376c..5758f4a5d78 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 @@ final class CountingSecurityManager extends SecurityManager implements Callable<
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 @@ final class CountingSecurityManager extends SecurityManager implements Callable<
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 @@ final class CountingSecurityManager extends SecurityManager implements Callable<
}
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 608d1d936db..b461497b96b 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 @@ final class CountingSecurityManager extends SecurityManager implements Callable<
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 @@ final class CountingSecurityManager extends SecurityManager implements Callable<
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 @@ final class CountingSecurityManager extends SecurityManager implements Callable<
}
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 d29eb163aed..7a54ce8b9a7 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 @@ final class CountingSecurityManager extends SecurityManager {
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 0a603593bba..73e2ea9e3b4 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 class JarClassLoaderTest extends NbTestCase {
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 029b9db853d..b14d886fa76 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 @@ public abstract class TestBaseHid extends MultiThreadedTestCaseHid {
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 6fab0f33a51..4e7b3e5e1b0 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 class StatFiles extends SecurityManager {
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 7caedcf8d87..56b5964ab58 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 @@ public class XMLUtilReflectionTest extends org.netbeans.junit.NbTestCase {
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();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists