aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/impl/ldap
diff options
context:
space:
mode:
authorIngo Bauersachs <ingo@jitsi.org>2014-02-14 10:25:32 +0100
committerIngo Bauersachs <ingo@jitsi.org>2014-02-18 10:56:35 +0100
commiteef30bf63134fb4fecf2df0cbe49fce60741998a (patch)
tree73bcaaa9ffa90e88f546bc53a2ac4d5a9b0bf401 /src/net/java/sip/communicator/impl/ldap
parent7b9ae60ccd94397c243983d8c67f5340ad8915ce (diff)
downloadjitsi-eef30bf63134fb4fecf2df0cbe49fce60741998a.zip
jitsi-eef30bf63134fb4fecf2df0cbe49fce60741998a.tar.gz
jitsi-eef30bf63134fb4fecf2df0cbe49fce60741998a.tar.bz2
Log LDAP errors with filter expression
Diffstat (limited to 'src/net/java/sip/communicator/impl/ldap')
-rw-r--r--src/net/java/sip/communicator/impl/ldap/LdapDirectoryImpl.java17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/net/java/sip/communicator/impl/ldap/LdapDirectoryImpl.java b/src/net/java/sip/communicator/impl/ldap/LdapDirectoryImpl.java
index 720c0ac..fbeddce 100644
--- a/src/net/java/sip/communicator/impl/ldap/LdapDirectoryImpl.java
+++ b/src/net/java/sip/communicator/impl/ldap/LdapDirectoryImpl.java
@@ -360,7 +360,8 @@ public class LdapDirectoryImpl
@Override
public void run()
{
- logger.trace("starting search for " + realQueryString +
+ String filter = buildSearchFilter(realQueryString);
+ logger.trace("starting search for " + filter +
" (initial query: \"" + query.toString() +
"\") on directory \"" + LdapDirectoryImpl.this + "\"");
@@ -383,7 +384,7 @@ public class LdapDirectoryImpl
NamingEnumeration<?> results = dirContext.search(
LdapDirectoryImpl.this.settings.getBaseDN(),
- buildSearchFilter(realQueryString),
+ filter,
searchControls
);
@@ -411,7 +412,7 @@ public class LdapDirectoryImpl
}
long time1 = System.currentTimeMillis();
- logger.trace("search for real query \"" + realQueryString +
+ logger.trace("search for real query \"" + filter +
"\" (initial query: \"" + query.toString() +
"\") on directory \"" + LdapDirectoryImpl.this +
"\" took " + (time1-time0) + "ms");
@@ -424,7 +425,7 @@ public class LdapDirectoryImpl
logger.error(
"use bind DN without password during search" +
" for real query \"" +
- realQueryString + "\" (initial query: \"" +
+ filter + "\" (initial query: \"" +
query.toString() + "\") on directory \"" +
LdapDirectoryImpl.this + "\": " + e);
endEvent = new LdapEvent(
@@ -438,7 +439,7 @@ public class LdapDirectoryImpl
logger.error(
"authentication failed during search" +
" for real query \"" +
- realQueryString + "\" (initial query: \"" +
+ filter + "\" (initial query: \"" +
query.toString() + "\") on directory \"" +
LdapDirectoryImpl.this + "\": " + e);
endEvent = new LdapEvent(
@@ -452,7 +453,7 @@ public class LdapDirectoryImpl
logger.error(
"an external exception was thrown during search" +
" for real query \"" +
- realQueryString + "\" (initial query: \"" +
+ filter + "\" (initial query: \"" +
query.toString() + "\") on directory \"" +
LdapDirectoryImpl.this + "\": " + e);
endEvent = new LdapEvent(
@@ -463,7 +464,7 @@ public class LdapDirectoryImpl
}
catch(LdapQueryCancelledException e)
{
- logger.trace("search for real query \"" + realQueryString +
+ logger.trace("search for real query \"" + filter +
"\" (initial query: \"" + query.toString() +
"\") on " + LdapDirectoryImpl.this +
" cancelled at state " + cancelState);
@@ -481,7 +482,7 @@ public class LdapDirectoryImpl
}
catch (Exception e)
{
- logger.error("search for real query \"" + realQueryString +
+ logger.error("search for real query \"" + filter +
"\" (initial query: \"" + query.toString() +
"\") on " + LdapDirectoryImpl.this +
" cancelled at state " + cancelState, e);