Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
Openfire
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Openfire
Commits
719cfe6f
Commit
719cfe6f
authored
Sep 25, 2017
by
Greg Thomas
Committed by
Guus der Kinderen
Sep 25, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Determine the class name from the class, rather than hard-coding it
parent
fe357fc1
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
LdapManager.java
src/java/org/jivesoftware/openfire/ldap/LdapManager.java
+5
-2
No files found.
src/java/org/jivesoftware/openfire/ldap/LdapManager.java
View file @
719cfe6f
...
@@ -16,6 +16,8 @@
...
@@ -16,6 +16,8 @@
package
org
.
jivesoftware
.
openfire
.
ldap
;
package
org
.
jivesoftware
.
openfire
.
ldap
;
import
com.sun.jndi.ldap.LdapCtxFactory
;
import
org.jivesoftware.openfire.group.GroupNotFoundException
;
import
org.jivesoftware.openfire.group.GroupNotFoundException
;
import
org.jivesoftware.openfire.user.UserNotFoundException
;
import
org.jivesoftware.openfire.user.UserNotFoundException
;
import
org.jivesoftware.util.JiveGlobals
;
import
org.jivesoftware.util.JiveGlobals
;
...
@@ -82,6 +84,7 @@ import java.util.regex.Pattern;
...
@@ -82,6 +84,7 @@ import java.util.regex.Pattern;
public
class
LdapManager
{
public
class
LdapManager
{
private
static
final
Logger
Log
=
LoggerFactory
.
getLogger
(
LdapManager
.
class
);
private
static
final
Logger
Log
=
LoggerFactory
.
getLogger
(
LdapManager
.
class
);
private
static
final
String
DEFAULT_LDAP_CONTEXT_FACTORY
=
LdapCtxFactory
.
class
.
getName
();
private
static
LdapManager
instance
;
private
static
LdapManager
instance
;
static
{
static
{
...
@@ -409,12 +412,12 @@ public class LdapManager {
...
@@ -409,12 +412,12 @@ public class LdapManager {
catch
(
ClassNotFoundException
cnfe
)
{
catch
(
ClassNotFoundException
cnfe
)
{
Log
.
error
(
"Initial context factory class failed to load: "
+
initialContextFactory
+
Log
.
error
(
"Initial context factory class failed to load: "
+
initialContextFactory
+
". Using default initial context factory class instead."
);
". Using default initial context factory class instead."
);
initialContextFactory
=
"com.sun.jndi.ldap.LdapCtxFactory"
;
initialContextFactory
=
DEFAULT_LDAP_CONTEXT_FACTORY
;
}
}
}
}
// Use default value if none was set.
// Use default value if none was set.
else
{
else
{
initialContextFactory
=
"com.sun.jndi.ldap.LdapCtxFactory"
;
initialContextFactory
=
DEFAULT_LDAP_CONTEXT_FACTORY
;
}
}
StringBuilder
buf
=
new
StringBuilder
();
StringBuilder
buf
=
new
StringBuilder
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment