Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4B74E18EDB for ; Fri, 22 May 2015 13:41:05 +0000 (UTC) Received: (qmail 41333 invoked by uid 500); 22 May 2015 13:41:00 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 41291 invoked by uid 500); 22 May 2015 13:41:00 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 41282 invoked by uid 99); 22 May 2015 13:41:00 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 May 2015 13:41:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0D532E0593; Fri, 22 May 2015 13:41:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: smckinney@apache.org To: commits@directory.apache.org Message-Id: <65cab2f019c445a6abc01480726fa9d3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: directory-fortress-core git commit: FC-105 - [fortress-core] - enable dead code Date: Fri, 22 May 2015 13:41:00 +0000 (UTC) Repository: directory-fortress-core Updated Branches: refs/heads/master 06a32b109 -> 1addda759 FC-105 - [fortress-core] - enable dead code 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/1addda75 Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/1addda75 Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/1addda75 Branch: refs/heads/master Commit: 1addda75904d8305e62e91fd3706fe4aaf823b1b Parents: 06a32b1 Author: Shawn McKinney Authored: Fri May 22 08:40:54 2015 -0500 Committer: Shawn McKinney Committed: Fri May 22 08:40:54 2015 -0500 ---------------------------------------------------------------------- .../core/ldap/container/OrganizationalUnitP.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/1addda75/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitP.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitP.java b/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitP.java index d296868..a3f9014 100755 --- a/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitP.java +++ b/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitP.java @@ -73,6 +73,7 @@ public class OrganizationalUnitP public final void add( OrganizationalUnit orgUnit ) throws SecurityException { + validate( orgUnit ); OrganizationalUnitDAO oDao = new OrganizationalUnitDAO(); oDao.create( orgUnit ); } @@ -126,7 +127,7 @@ public class OrganizationalUnitP throw new ValidationException( GlobalErrIds.CNTR_NAME_NULL, error ); } - if ( entity.getParent().length() > GlobalIds.OU_LEN ) + if ( entity.getParent() != null && entity.getParent().length() > GlobalIds.OU_LEN ) { String name = entity.getName(); String error = "validate parent [" + name + "] invalid length [" + entity.getName().length() @@ -135,15 +136,6 @@ public class OrganizationalUnitP throw new ValidationException( GlobalErrIds.CNTR_PARENT_INVLD, error ); } - if ( !VUtil.isNotNullOrEmpty( entity.getParent() ) ) - { - String error = "validate parent validation failed, null or empty value"; - LOG.warn( error ); - throw new ValidationException( GlobalErrIds.CNTR_PARENT_NULL, error ); - } - - VUtil.safeText( entity.getDescription(), GlobalIds.DESC_LEN ); - if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) ) { VUtil.description( entity.getDescription() );