directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject directory-fortress-core git commit: FC-105 - code cleanup
Date Mon, 01 Jun 2015 15:38:23 GMT
Repository: directory-fortress-core
Updated Branches:
  refs/heads/master f359b99d9 -> 43a4892c9


FC-105 - 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/43a4892c
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/43a4892c
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/43a4892c

Branch: refs/heads/master
Commit: 43a4892c91f323aed1cdfc2f12924ec38590f3e3
Parents: f359b99
Author: Shawn McKinney <smckinney@apache.org>
Authored: Mon Jun 1 10:38:29 2015 -0500
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Mon Jun 1 10:38:29 2015 -0500

----------------------------------------------------------------------
 .../org/apache/directory/fortress/core/rbac/AccessMgrImpl.java | 6 +++---
 .../org/apache/directory/fortress/core/rbac/AdminMgrImpl.java  | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/43a4892c/src/main/java/org/apache/directory/fortress/core/rbac/AccessMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/AccessMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/rbac/AccessMgrImpl.java
index 307003f..a81cf5f 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/AccessMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/AccessMgrImpl.java
@@ -92,13 +92,13 @@ public class AccessMgrImpl extends Manageable implements AccessMgr
         VUtil.assertNotNullOrEmpty( password, GlobalErrIds.USER_PW_NULL, getFullMethodName(
CLS_NM, methodName ) );
         User inUser = new User( userId );
         inUser.setContextId( contextId );
-        // false tells the User Read not to fetch roles.
+
+        // Determine if user valid.
         User user = userP.read( inUser, false );
         user.setPassword( password );
         user.setContextId( contextId );
         Session ftSess = userP.authenticate( user );
         ftSess.setUser( user );
-
         return ftSess;
     }
 
@@ -289,7 +289,7 @@ public class AccessMgrImpl extends Manageable implements AccessMgr
         role.setUserId( session.getUserId() );
         List<UserRole> uRoles;
         List<UserRole> sRoles = session.getRoles();
-        // If session already has role activated log an error and throw an exception:
+        // If session already has same role activated:
         if ( sRoles != null && sRoles.contains( role ) )
         {
             String info = getFullMethodName( CLS_NM, methodName ) + " User [" + session.getUserId()
+ "] Role ["

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/43a4892c/src/main/java/org/apache/directory/fortress/core/rbac/AdminMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/AdminMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/rbac/AdminMgrImpl.java
index 2416ce6..8a7583d 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/AdminMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/AdminMgrImpl.java
@@ -432,7 +432,6 @@ public final class AdminMgrImpl extends Manageable implements AdminMgr
             throw new SecurityException( GlobalErrIds.HIER_DEL_FAILED_HAS_CHILD, error, null
);
         }
         // search for all users assigned this role and deassign:
-        //role.setContextId(this.contextId);
         List<User> users = userP.getAssignedUsers( role );
         if ( users != null )
         {


Mime
View raw message