archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8344299: SM cleanup in javax.naming modules

Browse source 
Reviewed-by: alanb, dfuchs
This commit is contained in:
Aleksei Efimov 2024-11-28 17:43:27 +00:00
parent 43000a34d5
commit 959fa4a1a3
24 changed files with 88 additions and 382 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/java.naming/share/classes/javax/naming/spi/NamingManager.java
View file

@ -25,8 +25,6 @@
package javax.naming.spi;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.*;
import javax.naming.*;
@ -471,7 +469,6 @@ public class NamingManager {
* @see javax.naming.InitialContext
* @see javax.naming.directory.InitialDirContext
*/
@SuppressWarnings("removal")
public static Context getInitialContext(Hashtable<?,?> env)
throws NamingException {
ClassLoader loader;
@ -492,16 +489,8 @@ public class NamingManager {
throw ne;
}
if (System.getSecurityManager() == null) {
loader = Thread.currentThread().getContextClassLoader();
if (loader == null) loader = ClassLoader.getSystemClassLoader();
} else {
PrivilegedAction<ClassLoader> pa = () -> {
ClassLoader cl = Thread.currentThread().getContextClassLoader();
return (cl == null) ? ClassLoader.getSystemClassLoader() : cl;
};
loader = AccessController.doPrivileged(pa);
}
loader = Thread.currentThread().getContextClassLoader();
if (loader == null) loader = ClassLoader.getSystemClassLoader();
var key = FACTORIES_CACHE.sub(className);
try {
@ -570,12 +559,6 @@ public class NamingManager {
if (initctx_factory_builder != null)
throw new IllegalStateException(
"InitialContextFactoryBuilder already set");
@SuppressWarnings("removal")
SecurityManager security = System.getSecurityManager();
if (security != null) {
security.checkSetFactory();
}
initctx_factory_builder = builder;
}