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

8044627: Update JNDI to work with modules

Browse source 
Reviewed-by: alanb, chegar
This commit is contained in:
Pavel Rappo 2014-10-16 12:34:07 +01:00
parent 3f4fc41640
commit 4bf024dde1
5 changed files with 816 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,9 +25,7 @@
package javax.naming.spi;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.StringTokenizer;
import java.util.*;
import java.net.MalformedURLException;
import javax.naming.*;
@ -625,15 +623,28 @@ public class NamingManager {
/**
* Creates an initial context using the specified environment
* properties.
*<p>
* If an InitialContextFactoryBuilder has been installed,
* it is used to create the factory for creating the initial context.
* Otherwise, the class specified in the
* <tt>Context.INITIAL_CONTEXT_FACTORY</tt> environment property is used.
* Note that an initial context factory (an object that implements the
* InitialContextFactory interface) must be public and must have a
* public constructor that accepts no arguments.
*
* <p>
* This is done as follows:
* <ul>
* <li>If an InitialContextFactoryBuilder has been installed,
* it is used to create the factory for creating the initial
* context</li>
* <li>Otherwise, the class specified in the
* <tt>Context.INITIAL_CONTEXT_FACTORY</tt> environment property
* is used
* <ul>
* <li>First, the {@linkplain java.util.ServiceLoader ServiceLoader}
* mechanism tries to locate an {@code InitialContextFactory}
* provider using the current thread's context class loader</li>
* <li>Failing that, this implementation tries to locate a suitable
* {@code InitialContextFactory} using a built-in mechanism
* <br>
* (Note that an initial context factory (an object that implements
* the InitialContextFactory interface) must be public and must have
* a public constructor that accepts no arguments)</li>
* </ul>
* </li>
* </ul>
* @param env The possibly null environment properties used when
* creating the context.
* @return A non-null initial context.
@ -649,11 +660,11 @@ public class NamingManager {
*/
public static Context getInitialContext(Hashtable<?,?> env)
throws NamingException {
InitialContextFactory factory;
InitialContextFactory factory = null;
InitialContextFactoryBuilder builder = getInitialContextFactoryBuilder();
if (builder == null) {
// No factory installed, use property
// No builder installed, use property
// Get initial context factory class name
String className = env != null ?
@ -666,16 +677,39 @@ public class NamingManager {
throw ne;
}
ServiceLoader<InitialContextFactory> loader =
ServiceLoader.load(InitialContextFactory.class);
Iterator<InitialContextFactory> iterator = loader.iterator();
try {
factory = (InitialContextFactory)
helper.loadClass(className).newInstance();
} catch(Exception e) {
while (iterator.hasNext()) {
InitialContextFactory f = iterator.next();
if (f.getClass().getName().equals(className)) {
factory = f;
break;
}
}
} catch (ServiceConfigurationError e) {
NoInitialContextException ne =
new NoInitialContextException(
"Cannot instantiate class: " + className);
new NoInitialContextException(
"Cannot load initial context factory "
+ "'" + className + "'");
ne.setRootCause(e);
throw ne;
}
if (factory == null) {
try {
factory = (InitialContextFactory)
helper.loadClass(className).newInstance();
} catch (Exception e) {
NoInitialContextException ne =
new NoInitialContextException(
"Cannot instantiate class: " + className);
ne.setRootCause(e);
throw ne;
}
}
} else {
factory = builder.createInitialContextFactory(env);
}