Commit 76bc12a5 authored by Matt Tucker's avatar Matt Tucker Committed by matt

Throw better exception if user not found.


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@984 b35dd754-fafc-0310-a699-88a17e54d16e
parent 72932303
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
package org.jivesoftware.messenger.ldap; package org.jivesoftware.messenger.ldap;
import org.jivesoftware.messenger.JiveGlobals; import org.jivesoftware.messenger.JiveGlobals;
import org.jivesoftware.messenger.auth.UnauthorizedException; import org.jivesoftware.messenger.user.UserNotFoundException;
import org.jivesoftware.util.Log; import org.jivesoftware.util.Log;
import java.util.Hashtable; import java.util.Hashtable;
...@@ -399,7 +399,7 @@ public class LdapManager { ...@@ -399,7 +399,7 @@ public class LdapManager {
if (debug) { if (debug) {
Log.debug("User DN based on username '" + username + "' not found."); Log.debug("User DN based on username '" + username + "' not found.");
} }
throw new UnauthorizedException("Username " + username + " not found"); throw new UserNotFoundException("Username " + username + " not found");
} }
String userDN = ((SearchResult)answer.next()).getName(); String userDN = ((SearchResult)answer.next()).getName();
// Make sure there are no more search results. If there are, then // Make sure there are no more search results. If there are, then
...@@ -412,7 +412,7 @@ public class LdapManager { ...@@ -412,7 +412,7 @@ public class LdapManager {
Log.debug("Search for userDN based on username '" + username + "' found multiple " + Log.debug("Search for userDN based on username '" + username + "' found multiple " +
"responses, throwing exception."); "responses, throwing exception.");
} }
throw new Exception ("LDAP username lookup for " + username + throw new UserNotFoundException("LDAP username lookup for " + username +
" matched multiple entries."); " matched multiple entries.");
} }
return userDN; return userDN;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment