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-182 - cleanup
Date Tue, 20 Sep 2016 21:44:35 GMT
Repository: directory-fortress-core
Updated Branches:
  refs/heads/master 02695a3d4 -> 8daf4a5b5


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

Branch: refs/heads/master
Commit: 8daf4a5b5d2d84986e9a399a01383f43897ed45a
Parents: 02695a3
Author: Shawn McKinney <smckinney@apache.org>
Authored: Tue Sep 20 16:40:35 2016 -0500
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Tue Sep 20 16:40:35 2016 -0500

----------------------------------------------------------------------
 .../apache/directory/fortress/core/impl/AdminMgrImpl.java |  4 ++--
 .../apache/directory/fortress/core/impl/Manageable.java   | 10 +++-------
 2 files changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/8daf4a5b/src/main/java/org/apache/directory/fortress/core/impl/AdminMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AdminMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/AdminMgrImpl.java
index be3977d..8b2859c 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AdminMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AdminMgrImpl.java
@@ -127,7 +127,7 @@ public final class AdminMgrImpl extends Manageable implements AdminMgr,
Serializ
         // remove the user dn occupant attribute from assigned ldap role entities.
         roleP.removeOccupant( userDn, this.contextId );
         // remove the user dn occupant attribute from assigned ldap adminRole entities.
-        adminP.removeOccupant( userDn, user.getContextId() );
+        adminP.removeOccupant( userDn, this.contextId );
     }
 
 
@@ -147,7 +147,7 @@ public final class AdminMgrImpl extends Manageable implements AdminMgr,
Serializ
         // remove the user dn occupant attribute from assigned ldap role entities.
         roleP.removeOccupant( userDn, this.contextId );
         // remove the user dn occupant attribute from assigned ldap adminRole entities.
-        adminP.removeOccupant( userDn, user.getContextId() );
+        adminP.removeOccupant( userDn, this.contextId );
     }
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/8daf4a5b/src/main/java/org/apache/directory/fortress/core/impl/Manageable.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/Manageable.java b/src/main/java/org/apache/directory/fortress/core/impl/Manageable.java
index da3c89a..0de501a 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/Manageable.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/Manageable.java
@@ -32,9 +32,9 @@ import org.apache.directory.fortress.core.util.VUtil;
  * allows authorization
  * to be performed on behalf of the user who is contained within the Session object itself.
  * The ARBAC permissions will be checked each time outside client makes calls into Fortress
API.
- * This interface also allows Fortress clients to operate in a multi-tenant fashion using
{@link #setContextId(String)}.
+ * This allows Fortress clients to operate in a multi-tenant context: {@link #setContextId(String)}.
  * <p>
- * Implementers of this abstract class will NOT be thread safe because of instance variables
that may be set.
+ * Implementers of this abstract class will NOT be thread safe iff the instance variables
are set.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
@@ -68,7 +68,6 @@ public abstract class Manageable implements org.apache.directory.fortress.core.M
         this.contextId = contextId;
     }
 
-    
     /**
      * Set A/RBAC session on entity and perform authorization on behalf of the caller if
the {@link #adminSess} is set.
      *
@@ -88,8 +87,7 @@ public abstract class Manageable implements org.apache.directory.fortress.core.M
             AdminUtil.setEntitySession( this.adminSess, perm, entity, this.contextId );
         }
     }
-    
-    
+
     /**
      * Every Fortress Manager API (e.g. addUser, updateUser, addRole, ...) will perform authorization
on behalf of the 
      * caller IFF the {@link AuditMgrImpl#adminSess} has been set before invocation.
@@ -141,7 +139,6 @@ public abstract class Manageable implements org.apache.directory.fortress.core.M
         entity.setContextId(this.contextId);
     }
 
-    
     /**
      * Method will throw exception if entity reference is null, otherwise will set the contextId
of the tenant onto the 
      * supplied entity reference.
@@ -157,7 +154,6 @@ public abstract class Manageable implements org.apache.directory.fortress.core.M
         entity.setContextId( contextId );
     }
 
-    
     /**
      * Method will throw exception if entity reference is null, otherwise will set the contextId
of the tenant onto the 
      * supplied entity reference.


Mime
View raw message