Skip to content

Remove a compile time reference to com.sun.jndi.ldap.LdapCtxFactory #568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Remove a compile time reference to com.sun.jndi.ldap.LdapCtxFactory #568

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions core/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,7 @@
*/
public abstract class AbstractContextSource implements BaseLdapPathContextSource, InitializingBean {

private static final Class<com.sun.jndi.ldap.LdapCtxFactory> DEFAULT_CONTEXT_FACTORY
= com.sun.jndi.ldap.LdapCtxFactory.class;
private static final String DEFAULT_CONTEXT_FACTORY = "com.sun.jndi.ldap.LdapCtxFactory";

private static final Class<DefaultDirObjectFactory> DEFAULT_DIR_OBJECT_FACTORY = DefaultDirObjectFactory.class;
private static final boolean DONT_DISABLE_POOLING = false;
Expand All @@ -84,7 +83,7 @@ public abstract class AbstractContextSource implements BaseLdapPathContextSource

private Class<?> dirObjectFactory = DEFAULT_DIR_OBJECT_FACTORY;

private Class<?> contextFactory = DEFAULT_CONTEXT_FACTORY;
private Class<?> contextFactory;

private LdapName base = LdapUtils.emptyLdapName();

Expand Down Expand Up @@ -439,7 +438,7 @@ private Hashtable<String, Object> setupAnonymousEnv() {

Hashtable<String, Object> env = new Hashtable<String, Object>(baseEnv);

env.put(Context.INITIAL_CONTEXT_FACTORY, contextFactory.getName());
env.put(Context.INITIAL_CONTEXT_FACTORY, contextFactory != null ? contextFactory.getName() : DEFAULT_CONTEXT_FACTORY);
env.put(Context.PROVIDER_URL, assembleProviderUrlString(urls));

if (dirObjectFactory != null) {
Expand Down