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:19 UTC
[12/20] git commit: o Fixed a LOG o Used a better entry constructor
o Fixed a LOG
o Used a better entry constructor
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/6cda5356
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/6cda5356
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/6cda5356
Branch: refs/heads/master
Commit: 6cda535628237ae8c17f5ee1fda74c5fa74aa481
Parents: 800ffde
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Sun Nov 2 17:07:34 2014 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Sun Nov 2 17:07:34 2014 +0100
----------------------------------------------------------------------
.../ldap/container/OrganizationalUnitDAO.java | 22 ++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/6cda5356/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitDAO.java b/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitDAO.java
index f2e05cd..551362e 100755
--- a/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitDAO.java
@@ -97,16 +97,21 @@ final class OrganizationalUnitDAO extends ApacheDsDataProvider
{
LdapConnection ld = null;
String nodeDn = GlobalIds.OU + "=" + oe.getName() + ",";
+
if ( VUtil.isNotNullOrEmpty( oe.getParent() ) )
+ {
nodeDn += GlobalIds.OU + "=" + oe.getParent() + ",";
+ }
+
nodeDn += getRootDn( oe.getContextId() );
+
try
{
- LOG.info( "create container dn [" + nodeDn + "]" );
- Entry myEntry = new DefaultEntry( nodeDn );
- myEntry.add( GlobalIds.OBJECT_CLASS, ORGUNIT_OBJ_CLASS );
- myEntry.add( GlobalIds.OU, oe.getName() );
- myEntry.add( GlobalIds.DESC, oe.getDescription() );
+ LOG.info( "create container dn [{}]", nodeDn );
+ Entry myEntry = new DefaultEntry( nodeDn,
+ GlobalIds.OBJECT_CLASS, ORGUNIT_OBJ_CLASS,
+ GlobalIds.OU, oe.getName(),
+ GlobalIds.DESC, oe.getDescription() );
ld = getAdminConnection();
add( ld, myEntry );
}
@@ -132,11 +137,16 @@ final class OrganizationalUnitDAO extends ApacheDsDataProvider
{
LdapConnection ld = null;
String nodeDn = GlobalIds.OU + "=" + oe.getName() + ",";
+
if ( VUtil.isNotNullOrEmpty( oe.getParent() ) )
+ {
nodeDn += GlobalIds.OU + "=" + oe.getParent() + ",";
+ }
+
nodeDn += getRootDn( oe.getContextId(), GlobalIds.SUFFIX );
- LOG.info( "remove container dn [" + nodeDn + "]" );
+ LOG.info( "remove container dn [{}]", nodeDn );
+
try
{
ld = getAdminConnection();