Skip to content

Commit 3e96f5c

Browse files
koushikthirupatturseanjmullan
authored andcommitted
8351366: Remove the java.security.debug=scl option
Reviewed-by: hchao, mullan
1 parent 4247744 commit 3e96f5c

File tree

2 files changed

+2
-16
lines changed

2 files changed

+2
-16
lines changed

src/java.base/share/classes/java/security/SecureClassLoader.java

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,6 @@
2525

2626
package java.security;
2727

28-
import sun.security.util.Debug;
29-
3028
import java.util.Map;
3129
import java.util.Objects;
3230
import java.util.concurrent.ConcurrentHashMap;
@@ -181,13 +179,6 @@ protected PermissionCollection getPermissions(CodeSource codesource)
181179
return new Permissions(); // ProtectionDomain defers the binding
182180
}
183181

184-
/*
185-
* holder class for the static field "debug" to delay its initialization
186-
*/
187-
private static class DebugHolder {
188-
private static final Debug debug = Debug.getInstance("scl");
189-
}
190-
191182
/*
192183
* Returned cached ProtectionDomain for the specified CodeSource.
193184
*/
@@ -209,10 +200,6 @@ public ProtectionDomain apply(CodeSourceKey key) {
209200
= SecureClassLoader.this.getPermissions(key.cs);
210201
ProtectionDomain pd = new ProtectionDomain(
211202
key.cs, perms, SecureClassLoader.this, null);
212-
if (DebugHolder.debug != null) {
213-
DebugHolder.debug.println(" getPermissions " + pd);
214-
DebugHolder.debug.println("");
215-
}
216203
return pd;
217204
}
218205
});

src/java.base/share/classes/sun/security/util/Debug.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -104,7 +104,6 @@ public static void Help() {
104104
System.err.println("pkcs12 PKCS12 KeyStore debugging");
105105
System.err.println("properties Security property and configuration file debugging");
106106
System.err.println("sunpkcs11 SunPKCS11 provider debugging");
107-
System.err.println("scl permissions SecureClassLoader assigns");
108107
System.err.println("securerandom SecureRandom");
109108
System.err.println("ts timestamping");
110109
System.err.println("x509 X.509 certificate debugging");

0 commit comments

Comments
 (0)