You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2014/11/05 18:33:27 UTC
[20/20] git commit: Added teh SchemaConstants instead of teh
GlobalIds constants
Added teh SchemaConstants instead of teh GlobalIds constants
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/1a4d9716
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/1a4d9716
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/1a4d9716
Branch: refs/heads/master
Commit: 1a4d9716a8dc72a3aadbacd2e3598c2cc4591815
Parents: 24fe48d
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Wed Nov 5 18:32:22 2014 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Wed Nov 5 18:32:22 2014 +0100
----------------------------------------------------------------------
.../org/apache/directory/fortress/core/rbac/OrgUnitDAO.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/1a4d9716/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitDAO.java b/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitDAO.java
index 31f645d..41f83f0 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitDAO.java
@@ -494,6 +494,8 @@ final class OrgUnitDAO extends ApacheDsDataProvider
{
ouSet.add( getAttribute( searchResults.getEntry(), SchemaConstants.OU_AT ) );
}
+
+ searchResults.close();
}
catch ( LdapException e )
{
@@ -604,11 +606,11 @@ final class OrgUnitDAO extends ApacheDsDataProvider
switch ( orgUnit.type )
{
case USER:
- dn = new Dn( GlobalIds.OU + "=" + orgUnit.getName(), getRootDn( orgUnit.getContextId(), GlobalIds.OSU_ROOT ) );
+ dn = new Dn( SchemaConstants.OU_AT + "=" + orgUnit.getName(), getRootDn( orgUnit.getContextId(), GlobalIds.OSU_ROOT ) );
break;
case PERM:
- dn = new Dn( GlobalIds.OU + "=" + orgUnit.getName(), getRootDn( orgUnit.getContextId(), GlobalIds.PSU_ROOT ) );
+ dn = new Dn( SchemaConstants.OU_AT + "=" + orgUnit.getName(), getRootDn( orgUnit.getContextId(), GlobalIds.PSU_ROOT ) );
break;
default: