You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2015/02/11 02:45:42 UTC
directory-fortress-core git commit: FC-57 - Code cleanup
Repository: directory-fortress-core
Updated Branches:
refs/heads/master 786f582b7 -> 872c333a5
FC-57 - Code cleanup
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/872c333a
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/872c333a
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/872c333a
Branch: refs/heads/master
Commit: 872c333a58f1986849d9f882f8ced76884058139
Parents: 786f582
Author: Shawn McKinney <sm...@apache.org>
Authored: Tue Feb 10 19:45:28 2015 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Tue Feb 10 19:45:28 2015 -0600
----------------------------------------------------------------------
.../org/apache/directory/fortress/core/rbac/UserDAO.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/872c333a/src/main/java/org/apache/directory/fortress/core/rbac/UserDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/UserDAO.java b/src/main/java/org/apache/directory/fortress/core/rbac/UserDAO.java
index c42517a..9d52754 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/UserDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/UserDAO.java
@@ -874,8 +874,6 @@ final class UserDAO extends ApacheDsDataProvider
if(bindResponse.getLdapResult().getResultCode() != ResultCodeEnum.SUCCESS)
{
String info = "checkPassword INVALID PASSWORD for userId [" + user.getUserId() + "], resultCode [" + bindResponse.getLdapResult().getResultCode() + "]";
- session.setMsg( info );
- session.setErrorId( GlobalErrIds.USER_PW_INVLD );
throw new PasswordException( GlobalErrIds.USER_PW_INVLD, info );
}
PasswordPolicy respCtrl = getPwdRespCtrl( bindResponse );
@@ -895,10 +893,8 @@ final class UserDAO extends ApacheDsDataProvider
}
catch ( LdapAuthenticationException e )
{
- String info = "checkPassword INVALID PASSWORD for userId [" + user.getUserId() + "] exception";
- session.setMsg( info );
- session.setErrorId( GlobalErrIds.USER_PW_INVLD );
- session.setAuthenticated( false );
+ String info = "checkPassword INVALID PASSWORD for userId [" + user.getUserId() + "] exception [" + e + "]";
+ throw new PasswordException( GlobalErrIds.USER_PW_INVLD, info);
}
catch ( LdapException e )
{