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 0436ED770 for ; Tue, 13 Nov 2012 15:55:18 +0000 (UTC) Received: (qmail 61480 invoked by uid 500); 13 Nov 2012 15:55:17 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 61415 invoked by uid 500); 13 Nov 2012 15:55:17 -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 61399 invoked by uid 99); 13 Nov 2012 15:55:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Nov 2012 15:55:17 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Nov 2012 15:55:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2115723889D5 for ; Tue, 13 Nov 2012 15:54:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1408802 - /directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AliasDerefMode.java Date: Tue, 13 Nov 2012 15:54:53 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121113155454.2115723889D5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pamarcelot Date: Tue Nov 13 15:54:53 2012 New Revision: 1408802 URL: http://svn.apache.org/viewvc?rev=1408802&view=rev Log: Applied formatter. Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AliasDerefMode.java Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AliasDerefMode.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AliasDerefMode.java?rev=1408802&r1=1408801&r2=1408802&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AliasDerefMode.java (original) +++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AliasDerefMode.java Tue Nov 13 15:54:53 2012 @@ -236,24 +236,27 @@ public enum AliasDerefMode */ public static AliasDerefMode getDerefMode( String val ) { - if ( val.equals( NEVER_DEREF_ALIASES.jndiValue ) ) + if ( val != null ) { - return NEVER_DEREF_ALIASES; - } - - if ( val.equals( DEREF_IN_SEARCHING.jndiValue ) ) - { - return DEREF_IN_SEARCHING; - } - - if ( val.equals( DEREF_FINDING_BASE_OBJ.jndiValue ) ) - { - return DEREF_FINDING_BASE_OBJ; - } - - if ( val.equals( DEREF_ALWAYS.jndiValue ) ) - { - return DEREF_ALWAYS; + if ( val.equals( NEVER_DEREF_ALIASES.jndiValue ) ) + { + return NEVER_DEREF_ALIASES; + } + + if ( val.equals( DEREF_IN_SEARCHING.jndiValue ) ) + { + return DEREF_IN_SEARCHING; + } + + if ( val.equals( DEREF_FINDING_BASE_OBJ.jndiValue ) ) + { + return DEREF_FINDING_BASE_OBJ; + } + + if ( val.equals( DEREF_ALWAYS.jndiValue ) ) + { + return DEREF_ALWAYS; + } } throw new IllegalArgumentException( "Unknown derefmode " + val );