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: minor cleanup
Date Thu, 04 Jun 2015 00:22:54 GMT
Repository: directory-fortress-core
Updated Branches:
  refs/heads/1.0-RC41 1344104a0 -> 0e2f3891a


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

Branch: refs/heads/1.0-RC41
Commit: 0e2f3891a3a88a413129e0db8096bc9019e9b550
Parents: 1344104
Author: Shawn McKinney <smckinney@apache.org>
Authored: Wed Jun 3 19:23:04 2015 -0500
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Wed Jun 3 19:23:04 2015 -0500

----------------------------------------------------------------------
 .../org/apache/directory/fortress/core/impl/GroupDAO.java    | 8 +-------
 .../org/apache/directory/fortress/core/util/time/CUtil.java  | 6 +++---
 2 files changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0e2f3891/src/main/java/org/apache/directory/fortress/core/impl/GroupDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/GroupDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/GroupDAO.java
index e2ee369..8a19089 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/GroupDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/GroupDAO.java
@@ -251,13 +251,7 @@ final class GroupDAO extends ApacheDsDataProvider
         try
         {
             ld = getAdminConnection();
-            deleteRecursive( ld, nodeDn );
-        }
-        catch ( CursorException e )
-        {
-            String error = "remove group node dn [" + nodeDn + "] caught CursorException="
-                + e.getMessage();
-            throw new RemoveException( GlobalErrIds.GROUP_DELETE_FAILED, error, e );
+            delete( ld, nodeDn, group );
         }
         catch ( LdapException e )
         {

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0e2f3891/src/main/java/org/apache/directory/fortress/core/util/time/CUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/CUtil.java b/src/main/java/org/apache/directory/fortress/core/util/time/CUtil.java
index b45fcf6..97f2e41 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/CUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/CUtil.java
@@ -469,17 +469,17 @@ public final class CUtil
                     throw new ValidationException( rc, info );
                 }
             }
-            // Check the constraints for each role assignment:
+            // Check the constraints for each activated role:
             else
             {
                 if ( ObjUtil.isNotNullOrEmpty( session.getRoles() ) )
                 {
-                    // now check the constraint on every impl role activation candidate contained
within session object:
+                    // now check the constraint on every role activation candidate contained
within session object:
                     ListIterator<UserRole> roleItems = session.getRoles().listIterator();
 
                     while ( roleItems.hasNext() )
                     {
-                        Constraint constraint = ( Constraint ) roleItems.next();
+                        Constraint constraint = roleItems.next();
                         rc = val.validate( session, constraint, currTime );
 
                         if ( rc > 0 )


Mime
View raw message