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 - [fortress-core] - remove dead code, stack trace may be lost
Date Fri, 22 May 2015 14:01:30 GMT
Repository: directory-fortress-core
Updated Branches:
  refs/heads/master 746cbacb5 -> 7eb023cbe


FC-105 - [fortress-core] - remove dead code, stack trace may be lost


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

Branch: refs/heads/master
Commit: 7eb023cbe2305db83995d7919c261de6dd40a792
Parents: 746cbac
Author: Shawn McKinney <smckinney@apache.org>
Authored: Fri May 22 09:01:25 2015 -0500
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Fri May 22 09:01:25 2015 -0500

----------------------------------------------------------------------
 .../apache/directory/fortress/core/rbac/AdminRoleDAO.java    | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7eb023cb/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleDAO.java b/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleDAO.java
index 4e14bd4..318e943 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleDAO.java
@@ -439,7 +439,7 @@ final class AdminRoleDAO extends ApacheDsDataProvider
         {
             String warning = "getRole name [" + adminRole.getName() + "] Obj COULD NOT FIND
ENTRY for dn [" + dn
                 + "]";
-            throw new FinderException( GlobalErrIds.ARLE_NOT_FOUND, warning );
+            throw new FinderException( GlobalErrIds.ARLE_NOT_FOUND, warning, e );
         }
         catch ( LdapException e )
         {
@@ -621,7 +621,7 @@ final class AdminRoleDAO extends ApacheDsDataProvider
 
             while ( searchResults.next() )
             {
-                descendants.add( unloadDescendants( searchResults.getEntry(), sequence++,
contextId ) );
+                descendants.add( unloadDescendants( searchResults.getEntry(), sequence++
) );
             }
         }
         catch ( LdapException e )
@@ -647,12 +647,11 @@ final class AdminRoleDAO extends ApacheDsDataProvider
     *
     * @param le
     * @param sequence
-    * @param contextId
     * @return
      * @throws LdapInvalidAttributeValueException 
     * @throws LdapException
     */
-    private Graphable unloadDescendants( Entry le, long sequence, String contextId )
+    private Graphable unloadDescendants( Entry le, long sequence )
         throws LdapInvalidAttributeValueException
     {
         Role entity = new ObjectFactory().createRole();
@@ -682,7 +681,6 @@ final class AdminRoleDAO extends ApacheDsDataProvider
         entity.setName( getAttribute( le, SchemaConstants.CN_AT ) );
         unloadTemporal( le, entity );
         entity.setRoleRangeRaw( getAttribute( le, ROLE_RANGE ) );
-        //entity.setParents(AdminRoleUtil.getParents(entity.getName().toUpperCase(), contextId));
         entity.setParents( getAttributeSet( le, GlobalIds.PARENT_NODES ) );
         entity.setChildren( AdminRoleUtil.getChildren( entity.getName().toUpperCase(), contextId
) );
         return entity;


Mime
View raw message