Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 28916 invoked from network); 3 Oct 2010 22:44:17 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 3 Oct 2010 22:44:17 -0000 Received: (qmail 53002 invoked by uid 500); 3 Oct 2010 22:44:17 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 52939 invoked by uid 500); 3 Oct 2010 22:44: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 52932 invoked by uid 99); 3 Oct 2010 22:44:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 Oct 2010 22:44:17 +0000 X-ASF-Spam-Status: No, hits=-1996.4 required=10.0 tests=ALL_TRUSTED,FS_REPLICA 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; Sun, 03 Oct 2010 22:44:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B6AD72388A02; Sun, 3 Oct 2010 22:43:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1004064 [1/3] - in /directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap: ./ codec/ codec/actions/ codec/controls/replication/syncRequestValue/ codec/extended/operations/certGeneration/ csn/ entry/ message/ message/ex... Date: Sun, 03 Oct 2010 22:43:52 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101003224353.B6AD72388A02@eris.apache.org> Author: seelmann Date: Sun Oct 3 22:43:50 2010 New Revision: 1004064 URL: http://svn.apache.org/viewvc?rev=1004064&view=rev Log: Fix checkstyle errors: naming conventions and Javadocs Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/MultiException.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/NotImplementedException.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapStatesEnum.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/AttributeDescAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlsInitAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ErrorMessageAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAndFilterAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitApproxMatchFilterAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAssertionValueFilterAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAttributeDescFilterAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAttributeDescListAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitEqualityMatchFilterAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitExtensibleMatchFilterAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitGreaterOrEqualFilterAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitLessOrEqualFilterAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitNotFilterAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitOrFilterAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitPresentFilterAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitReferralsAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitSubstringsFilterAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/MatchedDNAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ModifyAttributeValueAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ReferralAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseNameAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResultCodeAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/SearchResultAttributeValueAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ServerSASLCredsAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreAnyAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreFinalAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreMatchValueAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreReferenceAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreTypeMatchingRuleAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ValueAction.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlGrammar.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/certGeneration/CertGenerationGrammar.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/csn/Csn.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntry.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageException.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchParams.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulShutdownRequest.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulShutdownResponse.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureRequest.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureResponse.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/spi/ProviderException.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AVA.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/ConcreteNameComponentNormalizer.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/ACIItemSyntaxChecker.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/SubtreeSpecificationSyntaxChecker.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/Base32.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/Base64.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/DateUtils.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/MultiException.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/MultiException.java?rev=1004064&r1=1004063&r2=1004064&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/MultiException.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/MultiException.java Sun Oct 3 22:43:50 2010 @@ -35,6 +35,7 @@ import java.util.Iterator; */ public class MultiException extends Exception { + /** The serialVersionUID. */ static final long serialVersionUID = 2889747406899775761L; /** Collection of nested exceptions. */ Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/NotImplementedException.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/NotImplementedException.java?rev=1004064&r1=1004063&r2=1004064&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/NotImplementedException.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/NotImplementedException.java Sun Oct 3 22:43:50 2010 @@ -31,6 +31,7 @@ package org.apache.directory.shared.ldap */ public class NotImplementedException extends RuntimeException { + /** The serialVersionUID. */ static final long serialVersionUID = -5899307402675964298L; @@ -46,11 +47,11 @@ public class NotImplementedException ext /** * Constructs an Exception with a detailed message. * - * @param a_msg + * @param msg * The message associated with the exception. */ - public NotImplementedException(String a_msg) + public NotImplementedException( String msg ) { - super( "N O T I M P L E M E N T E D Y E T !\n" + a_msg ); + super( "N O T I M P L E M E N T E D Y E T !\n" + msg ); } } Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java?rev=1004064&r1=1004063&r2=1004064&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java Sun Oct 3 22:43:50 2010 @@ -141,16 +141,16 @@ import org.slf4j.LoggerFactory; * * @author Apache Directory Project */ -public class LdapMessageGrammar extends AbstractGrammar +public final class LdapMessageGrammar extends AbstractGrammar { // ~ Static fields/initializers // ----------------------------------------------------------------- /** The logger */ - static final Logger log = LoggerFactory.getLogger( LdapMessageGrammar.class ); + static final Logger LOG = LoggerFactory.getLogger( LdapMessageGrammar.class ); /** A speedup for logger */ - static final boolean IS_DEBUG = log.isDebugEnabled(); + static final boolean IS_DEBUG = LOG.isDebugEnabled(); /** The instance of grammar. LdapMessageGrammar is a singleton */ private static Grammar instance = new LdapMessageGrammar(); @@ -196,7 +196,7 @@ public class LdapMessageGrammar extends // The Length should not be null if ( tlv.getLength() == 0 ) { - log.error( I18n.err( I18n.ERR_04066 ) ); + LOG.error( I18n.err( I18n.ERR_04066 ) ); // This will generate a PROTOCOL_ERROR throw new DecoderException( I18n.err( I18n.ERR_04067 ) ); @@ -232,7 +232,7 @@ public class LdapMessageGrammar extends // The Length should not be null if ( tlv.getLength() == 0 ) { - log.error( I18n.err( I18n.ERR_04068 ) ); + LOG.error( I18n.err( I18n.ERR_04068 ) ); // This will generate a PROTOCOL_ERROR throw new DecoderException( I18n.err( I18n.ERR_04069 ) ); @@ -248,12 +248,12 @@ public class LdapMessageGrammar extends if ( IS_DEBUG ) { - log.debug( "Ldap Message Id has been decoded : " + messageId ); + LOG.debug( "Ldap Message Id has been decoded : " + messageId ); } } catch ( IntegerDecoderException ide ) { - log.error( I18n.err( I18n.ERR_04070, StringTools.dumpBytes( value.getData() ), ide + LOG.error( I18n.err( I18n.ERR_04070, StringTools.dumpBytes( value.getData() ), ide .getLocalizedMessage() ) ); // This will generate a PROTOCOL_ERROR @@ -312,7 +312,7 @@ public class LdapMessageGrammar extends // The Length should be null if ( expectedLength != 0 ) { - log.error( I18n.err( I18n.ERR_04071, Integer.valueOf( expectedLength ) ) ); + LOG.error( I18n.err( I18n.ERR_04071, Integer.valueOf( expectedLength ) ) ); // This will generate a PROTOCOL_ERROR throw new DecoderException( I18n.err( I18n.ERR_04072 ) ); @@ -379,7 +379,7 @@ public class LdapMessageGrammar extends { String msg = I18n.err( I18n.ERR_04074, dnStr, StringTools.dumpBytes( dnBytes ), ine .getLocalizedMessage() ); - log.error( msg ); + LOG.error( msg ); DeleteResponseImpl response = new DeleteResponseImpl( delRequest.getMessageId() ); throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX, @@ -394,7 +394,7 @@ public class LdapMessageGrammar extends if ( IS_DEBUG ) { - log.debug( "Deleting DN {}", entry ); + LOG.debug( "Deleting DN {}", entry ); } } } ); @@ -438,7 +438,7 @@ public class LdapMessageGrammar extends if ( ( value == null ) || ( value.getData() == null ) ) { String msg = I18n.err( I18n.ERR_04075 ); - log.error( msg ); + LOG.error( msg ); // This will generate a PROTOCOL_ERROR throw new DecoderException( msg ); @@ -452,7 +452,7 @@ public class LdapMessageGrammar extends if ( IS_DEBUG ) { - log + LOG .debug( "AbandonMessage Id has been decoded : {}", Integer .valueOf( abandonnedMessageId ) ); } @@ -463,7 +463,7 @@ public class LdapMessageGrammar extends } catch ( IntegerDecoderException ide ) { - log.error( I18n + LOG.error( I18n .err( I18n.ERR_04076, StringTools.dumpBytes( value.getData() ), ide.getMessage() ) ); // This will generate a PROTOCOL_ERROR @@ -508,7 +508,7 @@ public class LdapMessageGrammar extends if ( tlv.getLength() == 0 ) { String msg = I18n.err( I18n.ERR_04077 ); - log.error( msg ); + LOG.error( msg ); // This will generate a PROTOCOL_ERROR throw new DecoderException( msg ); @@ -545,14 +545,14 @@ public class LdapMessageGrammar extends if ( IS_DEBUG ) { - log.debug( "Ldap version ", Integer.valueOf( version ) ); + LOG.debug( "Ldap version ", Integer.valueOf( version ) ); } bindRequestMessage.setVersion3( version == 3 ); } catch ( IntegerDecoderException ide ) { - log.error( I18n + LOG.error( I18n .err( I18n.ERR_04078, StringTools.dumpBytes( value.getData() ), ide.getMessage() ) ); // This will generate a PROTOCOL_ERROR @@ -601,7 +601,7 @@ public class LdapMessageGrammar extends { String msg = "Incorrect DN given : " + dnStr + " (" + StringTools.dumpBytes( dnBytes ) + ") is invalid"; - log.error( "{} : {}", msg, ine.getMessage() ); + LOG.error( "{} : {}", msg, ine.getMessage() ); BindResponseImpl response = new BindResponseImpl( bindRequestMessage.getMessageId() ); @@ -612,7 +612,7 @@ public class LdapMessageGrammar extends if ( IS_DEBUG ) { - log.debug( " The Bind name is {}", bindRequestMessage.getName() ); + LOG.debug( " The Bind name is {}", bindRequestMessage.getName() ); } } } ); @@ -658,7 +658,7 @@ public class LdapMessageGrammar extends if ( IS_DEBUG ) { - log.debug( "The simple authentication is : {}", StringTools.dumpBytes( bindRequestMessage + LOG.debug( "The simple authentication is : {}", StringTools.dumpBytes( bindRequestMessage .getCredentials() ) ); } } @@ -702,7 +702,7 @@ public class LdapMessageGrammar extends if ( tlv.getLength() == 0 ) { String msg = I18n.err( I18n.ERR_04079 ); - log.error( msg ); + LOG.error( msg ); BindResponseImpl response = new BindResponseImpl( bindRequestMessage.getMessageId() ); @@ -714,7 +714,7 @@ public class LdapMessageGrammar extends if ( IS_DEBUG ) { - log.debug( "The SaslCredential has been created" ); + LOG.debug( "The SaslCredential has been created" ); } } } ); @@ -753,7 +753,7 @@ public class LdapMessageGrammar extends if ( IS_DEBUG ) { - log.debug( "The mechanism is : {}", bindRequestMessage.getSaslMechanism() ); + LOG.debug( "The mechanism is : {}", bindRequestMessage.getSaslMechanism() ); } } } ); @@ -795,7 +795,7 @@ public class LdapMessageGrammar extends if ( IS_DEBUG ) { - log.debug( "The credentials are : {}", StringTools.dumpBytes( bindRequestMessage + LOG.debug( "The credentials are : {}", StringTools.dumpBytes( bindRequestMessage .getCredentials() ) ); } } @@ -1026,7 +1026,7 @@ public class LdapMessageGrammar extends if ( tlv.getLength() == 0 ) { String msg = I18n.err( I18n.ERR_04080 ); - log.error( msg ); + LOG.error( msg ); // This will generate a PROTOCOL_ERROR throw new DecoderException( msg ); @@ -1150,7 +1150,7 @@ public class LdapMessageGrammar extends // This is for the client side. We will never decode LdapResult on the server String msg = "The DN " + StringTools.dumpBytes( dnBytes ) + "is invalid : " + ine.getMessage(); - log.error( "{} : {}", msg, ine.getMessage() ); + LOG.error( "{} : {}", msg, ine.getMessage() ); throw new DecoderException( msg, ine ); } @@ -1159,7 +1159,7 @@ public class LdapMessageGrammar extends if ( IS_DEBUG ) { - log.debug( "Search Result Entry DN found : {}", searchResultEntry.getObjectName() ); + LOG.debug( "Search Result Entry DN found : {}", searchResultEntry.getObjectName() ); } } } ); @@ -1242,7 +1242,7 @@ public class LdapMessageGrammar extends { // The type can't be null String msg = I18n.err( I18n.ERR_04081 ); - log.error( msg ); + LOG.error( msg ); throw new DecoderException( msg ); } else @@ -1257,14 +1257,14 @@ public class LdapMessageGrammar extends { // This is for the client side. We will never decode LdapResult on the server String msg = "The Attribute type " + type + "is invalid : " + ine.getMessage(); - log.error( "{} : {}", msg, ine.getMessage() ); + LOG.error( "{} : {}", msg, ine.getMessage() ); throw new DecoderException( msg, ine ); } } if ( IS_DEBUG ) { - log.debug( "Attribute type : {}", type ); + LOG.debug( "Attribute type : {}", type ); } } } ); @@ -1384,7 +1384,7 @@ public class LdapMessageGrammar extends SearchResultDone searchResultDone = new SearchResultDoneImpl( ldapMessageContainer.getMessageId() ); ldapMessageContainer.setMessage( searchResultDone ); - log.debug( "Search Result Done found" ); + LOG.debug( "Search Result Done found" ); } } ); @@ -1464,7 +1464,7 @@ public class LdapMessageGrammar extends { String msg = "Invalid DN given : " + dnStr + " (" + StringTools.dumpBytes( dnBytes ) + ") is invalid"; - log.error( "{} : {}", msg, ine.getMessage() ); + LOG.error( "{} : {}", msg, ine.getMessage() ); ModifyResponseImpl response = new ModifyResponseImpl( modifyRequest.getMessageId() ); throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX, @@ -1476,7 +1476,7 @@ public class LdapMessageGrammar extends if ( IS_DEBUG ) { - log.debug( "Modification of DN {}", modifyRequest.getName() ); + LOG.debug( "Modification of DN {}", modifyRequest.getName() ); } } } ); @@ -1537,7 +1537,7 @@ public class LdapMessageGrammar extends catch ( IntegerDecoderException ide ) { String msg = I18n.err( I18n.ERR_04082, StringTools.dumpBytes( tlv.getValue().getData() ) ); - log.error( msg ); + LOG.error( msg ); // This will generate a PROTOCOL_ERROR throw new DecoderException( msg ); @@ -1551,15 +1551,15 @@ public class LdapMessageGrammar extends switch ( operation ) { case LdapConstants.OPERATION_ADD: - log.debug( "Modification operation : ADD" ); + LOG.debug( "Modification operation : ADD" ); break; case LdapConstants.OPERATION_DELETE: - log.debug( "Modification operation : DELETE" ); + LOG.debug( "Modification operation : DELETE" ); break; case LdapConstants.OPERATION_REPLACE: - log.debug( "Modification operation : REPLACE" ); + LOG.debug( "Modification operation : REPLACE" ); break; } } @@ -1615,7 +1615,7 @@ public class LdapMessageGrammar extends if ( tlv.getLength() == 0 ) { String msg = I18n.err( I18n.ERR_04083 ); - log.error( msg ); + LOG.error( msg ); ModifyResponseImpl response = new ModifyResponseImpl( modifyRequest.getMessageId() ); throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, @@ -1629,7 +1629,7 @@ public class LdapMessageGrammar extends if ( IS_DEBUG ) { - log.debug( "Modifying type : {}", type ); + LOG.debug( "Modifying type : {}", type ); } } } ); @@ -1662,13 +1662,13 @@ public class LdapMessageGrammar extends // If the length is null, we store an empty value if ( tlv.getLength() == 0 ) { - log.debug( "No vals for this attribute" ); + LOG.debug( "No vals for this attribute" ); } // We can have an END transition ldapMessageContainer.grammarEndAllowed( true ); - log.debug( "Some vals are to be decoded" ); + LOG.debug( "Some vals are to be decoded" ); } } ); @@ -1793,7 +1793,7 @@ public class LdapMessageGrammar extends ModifyResponse modifyResponse = new ModifyResponseImpl( ldapMessageContainer.getMessageId() ); ldapMessageContainer.setMessage( modifyResponse ); - log.debug( "Modify response" ); + LOG.debug( "Modify response" ); } } ); @@ -1839,7 +1839,7 @@ public class LdapMessageGrammar extends if ( tlv.getLength() == 0 ) { String msg = I18n.err( I18n.ERR_04084 ); - log.error( msg ); + LOG.error( msg ); // Will generate a PROTOCOL_ERROR throw new DecoderException( msg ); @@ -1871,7 +1871,7 @@ public class LdapMessageGrammar extends if ( tlv.getLength() == 0 ) { String msg = I18n.err( I18n.ERR_04085 ); - log.error( msg ); + LOG.error( msg ); AddResponseImpl response = new AddResponseImpl( addRequest.getMessageId() ); @@ -1894,7 +1894,7 @@ public class LdapMessageGrammar extends { String msg = "Invalid DN given : " + dnStr + " (" + StringTools.dumpBytes( dnBytes ) + ") is invalid"; - log.error( "{} : {}", msg, ine.getMessage() ); + LOG.error( "{} : {}", msg, ine.getMessage() ); AddResponseImpl response = new AddResponseImpl( addRequest.getMessageId() ); throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX, @@ -1904,7 +1904,7 @@ public class LdapMessageGrammar extends addRequest.setEntryDn( entryDn ); } - log.debug( "Adding an entry with DN : {}", addRequest.getEntry() ); + LOG.debug( "Adding an entry with DN : {}", addRequest.getEntry() ); } } ); @@ -1956,7 +1956,7 @@ public class LdapMessageGrammar extends if ( tlv.getLength() == 0 ) { String msg = I18n.err( I18n.ERR_04086 ); - log.error( msg ); + LOG.error( msg ); AddResponseImpl response = new AddResponseImpl( addRequest.getMessageId() ); @@ -1973,7 +1973,7 @@ public class LdapMessageGrammar extends catch ( LdapException ne ) { String msg = I18n.err( I18n.ERR_04087 ); - log.error( msg ); + LOG.error( msg ); AddResponseImpl response = new AddResponseImpl( addRequest.getMessageId() ); throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, @@ -1982,7 +1982,7 @@ public class LdapMessageGrammar extends if ( IS_DEBUG ) { - log.debug( "Adding type {}", type ); + LOG.debug( "Adding type {}", type ); } } } ); @@ -2069,11 +2069,11 @@ public class LdapMessageGrammar extends if ( expectedLength == 0 ) { String msg = I18n.err( I18n.ERR_04088 ); - log.error( msg ); + LOG.error( msg ); throw new DecoderException( msg ); } - log.debug( "Add Response" ); + LOG.debug( "Add Response" ); } } ); @@ -2110,7 +2110,7 @@ public class LdapMessageGrammar extends DeleteResponse delResponse = new DeleteResponseImpl( ldapMessageContainer.getMessageId() ); ldapMessageContainer.setMessage( delResponse ); - log.debug( "Del response " ); + LOG.debug( "Del response " ); } } ); @@ -2149,7 +2149,7 @@ public class LdapMessageGrammar extends .getMessageId() ); ldapMessageContainer.setMessage( modifyDnRequest ); - log.debug( "ModifyDn request" ); + LOG.debug( "ModifyDn request" ); } } ); @@ -2196,7 +2196,7 @@ public class LdapMessageGrammar extends { String msg = "Invalid DN given : " + dnStr + " (" + StringTools.dumpBytes( dnBytes ) + ") is invalid"; - log.error( "{} : {}", msg, ine.getMessage() ); + LOG.error( "{} : {}", msg, ine.getMessage() ); ModifyDnResponseImpl response = new ModifyDnResponseImpl( modifyDNRequest.getMessageId() ); throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX, @@ -2208,7 +2208,7 @@ public class LdapMessageGrammar extends if ( IS_DEBUG ) { - log.debug( "Modifying DN {}", entry ); + LOG.debug( "Modifying DN {}", entry ); } } } ); @@ -2244,7 +2244,7 @@ public class LdapMessageGrammar extends if ( tlv.getLength() == 0 ) { String msg = I18n.err( I18n.ERR_04090 ); - log.error( msg ); + LOG.error( msg ); ModifyDnResponseImpl response = new ModifyDnResponseImpl( modifyDnRequest.getMessageId() ); throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX, @@ -2264,7 +2264,7 @@ public class LdapMessageGrammar extends { String msg = "Invalid new RDN given : " + dnStr + " (" + StringTools.dumpBytes( dnBytes ) + ") is invalid"; - log.error( "{} : {}", msg, ine.getMessage() ); + LOG.error( "{} : {}", msg, ine.getMessage() ); ModifyDnResponseImpl response = new ModifyDnResponseImpl( modifyDnRequest.getMessageId() ); throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX, @@ -2276,7 +2276,7 @@ public class LdapMessageGrammar extends if ( IS_DEBUG ) { - log.debug( "Modifying with new RDN {}", newRdn ); + LOG.debug( "Modifying with new RDN {}", newRdn ); } } } ); @@ -2315,7 +2315,7 @@ public class LdapMessageGrammar extends } catch ( BooleanDecoderException bde ) { - log.error( I18n + LOG.error( I18n .err( I18n.ERR_04091, StringTools.dumpBytes( value.getData() ), bde.getMessage() ) ); // This will generate a PROTOCOL_ERROR @@ -2329,11 +2329,11 @@ public class LdapMessageGrammar extends { if ( modifyDnRequest.getDeleteOldRdn() ) { - log.debug( " Old RDN attributes will be deleted" ); + LOG.debug( " Old RDN attributes will be deleted" ); } else { - log.debug( " Old RDN attributes will be retained" ); + LOG.debug( " Old RDN attributes will be retained" ); } } } @@ -2373,7 +2373,7 @@ public class LdapMessageGrammar extends } else { - log.warn( "The new superior is null, so we will change the entry" ); + LOG.warn( "The new superior is null, so we will change the entry" ); } modifyDnRequest.setNewSuperior( newSuperior ); @@ -2391,7 +2391,7 @@ public class LdapMessageGrammar extends { String msg = "Invalid new superior DN given : " + dnStr + " (" + StringTools.dumpBytes( dnBytes ) + ") is invalid"; - log.error( "{} : {}", msg, ine.getMessage() ); + LOG.error( "{} : {}", msg, ine.getMessage() ); ModifyDnResponseImpl response = new ModifyDnResponseImpl( modifyDnRequest.getMessageId() ); throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX, @@ -2406,7 +2406,7 @@ public class LdapMessageGrammar extends if ( IS_DEBUG ) { - log.debug( "New superior DN {}", newSuperior ); + LOG.debug( "New superior DN {}", newSuperior ); } } } ); @@ -2455,7 +2455,7 @@ public class LdapMessageGrammar extends ModifyDnResponse modifyDnResponse = new ModifyDnResponseImpl( ldapMessageContainer.getMessageId() ); ldapMessageContainer.setMessage( modifyDnResponse ); - log.debug( "Modify DN response " ); + LOG.debug( "Modify DN response " ); } } ); @@ -2497,7 +2497,7 @@ public class LdapMessageGrammar extends CompareRequest compareRequest = new CompareRequestImpl( ldapMessageContainer.getMessageId() ); ldapMessageContainer.setMessage( compareRequest ); - log.debug( "Compare Request" ); + LOG.debug( "Compare Request" ); } } ); @@ -2543,7 +2543,7 @@ public class LdapMessageGrammar extends { String msg = "Invalid DN given : " + dnStr + " (" + StringTools.dumpBytes( dnBytes ) + ") is invalid"; - log.error( "{} : {}", msg, ine.getMessage() ); + LOG.error( "{} : {}", msg, ine.getMessage() ); CompareResponseImpl response = new CompareResponseImpl( compareRequest.getMessageId() ); throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX, @@ -2555,7 +2555,7 @@ public class LdapMessageGrammar extends if ( IS_DEBUG ) { - log.debug( "Comparing DN {}", entry ); + LOG.debug( "Comparing DN {}", entry ); } } } ); @@ -2603,7 +2603,7 @@ public class LdapMessageGrammar extends if ( tlv.getLength() == 0 ) { String msg = I18n.err( I18n.ERR_04093 ); - log.error( msg ); + LOG.error( msg ); CompareResponseImpl response = new CompareResponseImpl( compareRequest.getMessageId() ); throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, @@ -2615,7 +2615,7 @@ public class LdapMessageGrammar extends if ( IS_DEBUG ) { - log.debug( "Comparing attribute description {}", compareRequest.getAttributeId() ); + LOG.debug( "Comparing attribute description {}", compareRequest.getAttributeId() ); } } } ); @@ -2658,7 +2658,7 @@ public class LdapMessageGrammar extends if ( IS_DEBUG ) { - log.debug( "Comparing attribute value {}", StringTools.dumpBytes( compareRequest + LOG.debug( "Comparing attribute value {}", StringTools.dumpBytes( compareRequest .getAssertionValue().getBytes() ) ); } } @@ -2666,9 +2666,9 @@ public class LdapMessageGrammar extends { compareRequest.setAssertionValue( StringTools.utf8ToString( tlv.getValue().getData() ) ); - if ( log.isDebugEnabled() ) + if ( LOG.isDebugEnabled() ) { - log.debug( "Comparing attribute value {}", compareRequest.getAssertionValue() ); + LOG.debug( "Comparing attribute value {}", compareRequest.getAssertionValue() ); } } } @@ -2717,11 +2717,11 @@ public class LdapMessageGrammar extends if ( tlv.getLength() == 0 ) { String msg = I18n.err( I18n.ERR_04094 ); - log.error( msg ); + LOG.error( msg ); throw new DecoderException( msg ); } - log.debug( "Compare response " ); + LOG.debug( "Compare response " ); } } ); @@ -2760,7 +2760,7 @@ public class LdapMessageGrammar extends .getMessageId() ); ldapMessageContainer.setMessage( searchResultReference ); - log.debug( "SearchResultReference response " ); + LOG.debug( "SearchResultReference response " ); } } ); @@ -2818,7 +2818,7 @@ public class LdapMessageGrammar extends .getMessageId() ); ldapMessageContainer.setMessage( extendedRequest ); - log.debug( "Extended request" ); + LOG.debug( "Extended request" ); } } ); @@ -2849,7 +2849,7 @@ public class LdapMessageGrammar extends if ( tlv.getLength() == 0 ) { String msg = I18n.err( I18n.ERR_04095 ); - log.error( msg ); + LOG.error( msg ); // This will generate a PROTOCOL_ERROR throw new DecoderException( msg ); } @@ -2867,7 +2867,7 @@ public class LdapMessageGrammar extends String msg = "The Request name is not a valid OID : " + StringTools.utf8ToString( requestNameBytes ) + " (" + StringTools.dumpBytes( requestNameBytes ) + ") is invalid"; - log.error( msg ); + LOG.error( msg ); // throw an exception, we will get a PROTOCOL_ERROR throw new DecoderException( msg ); @@ -2880,7 +2880,7 @@ public class LdapMessageGrammar extends String msg = "The Request name is not a valid OID : " + StringTools.utf8ToString( requestNameBytes ) + " (" + StringTools.dumpBytes( requestNameBytes ) + ") is invalid"; - log.error( "{} : {}", msg, de.getMessage() ); + LOG.error( "{} : {}", msg, de.getMessage() ); // Rethrow the exception, we will get a PROTOCOL_ERROR throw de; @@ -2892,7 +2892,7 @@ public class LdapMessageGrammar extends if ( IS_DEBUG ) { - log.debug( "OID read : {}", extendedRequest.getRequestName() ); + LOG.debug( "OID read : {}", extendedRequest.getRequestName() ); } } } ); @@ -2935,7 +2935,7 @@ public class LdapMessageGrammar extends if ( IS_DEBUG ) { - log.debug( "Extended value : {}", extendedRequest.getRequestValue() ); + LOG.debug( "Extended value : {}", extendedRequest.getRequestValue() ); } } } ); @@ -2983,7 +2983,7 @@ public class LdapMessageGrammar extends ExtendedResponse extendedResponse = new ExtendedResponseImpl( ldapMessageContainer.getMessageId() ); ldapMessageContainer.setMessage( extendedResponse ); - log.debug( "Extended Response" ); + LOG.debug( "Extended Response" ); } } ); @@ -3194,7 +3194,7 @@ public class LdapMessageGrammar extends .getMessageId() ); ldapMessageContainer.setMessage( intermediateResponse ); - log.debug( "Intermediate Response" ); + LOG.debug( "Intermediate Response" ); } } ); @@ -3226,7 +3226,7 @@ public class LdapMessageGrammar extends if ( tlv.getLength() == 0 ) { String msg = I18n.err( I18n.ERR_04095 ); - log.error( msg ); + LOG.error( msg ); // This will generate a PROTOCOL_ERROR throw new DecoderException( msg ); } @@ -3246,7 +3246,7 @@ public class LdapMessageGrammar extends String msg = "The Intermediate Response name is not a valid OID : " + StringTools.utf8ToString( responseNameBytes ) + " (" + StringTools.dumpBytes( responseNameBytes ) + ") is invalid"; - log.error( "{} : {}", msg, oidStr ); + LOG.error( "{} : {}", msg, oidStr ); // Rethrow the exception, we will get a PROTOCOL_ERROR throw new DecoderException( msg ); @@ -3258,7 +3258,7 @@ public class LdapMessageGrammar extends if ( IS_DEBUG ) { - log.debug( "OID read : {}", intermediateResponse.getResponseName() ); + LOG.debug( "OID read : {}", intermediateResponse.getResponseName() ); } } } ); @@ -3302,7 +3302,7 @@ public class LdapMessageGrammar extends if ( IS_DEBUG ) { - log.debug( "Value read : {}", StringTools.dumpBytes( intermediateResponse.getResponseValue() ) ); + LOG.debug( "Value read : {}", StringTools.dumpBytes( intermediateResponse.getResponseValue() ) ); } } } ); @@ -3345,7 +3345,7 @@ public class LdapMessageGrammar extends if ( IS_DEBUG ) { - log.debug( "Response value : {}", intermediateResponse.getResponseValue() ); + LOG.debug( "Response value : {}", intermediateResponse.getResponseValue() ); } } } ); @@ -3390,7 +3390,7 @@ public class LdapMessageGrammar extends if ( expectedLength == 0 ) { String msg = I18n.err( I18n.ERR_04096 ); - log.error( msg ); + LOG.error( msg ); // This will generate a PROTOCOL_ERROR throw new DecoderException( msg ); @@ -3431,7 +3431,7 @@ public class LdapMessageGrammar extends if ( tlv.getLength() == 0 ) { String msg = I18n.err( I18n.ERR_04097 ); - log.error( msg ); + LOG.error( msg ); // This will generate a PROTOCOL_ERROR throw new DecoderException( msg ); @@ -3443,7 +3443,7 @@ public class LdapMessageGrammar extends // The OID is encoded as a String, not an Object Id if ( !OID.isOID( oidValue ) ) { - log.error( I18n.err( I18n.ERR_04098, StringTools.dumpBytes( value ) ) ); + LOG.error( I18n.err( I18n.ERR_04098, StringTools.dumpBytes( value ) ) ); // This will generate a PROTOCOL_ERROR throw new DecoderException( I18n.err( I18n.ERR_04099, oidValue ) ); @@ -3466,7 +3466,7 @@ public class LdapMessageGrammar extends if ( IS_DEBUG ) { - log.debug( "Control OID : " + oidValue ); + LOG.debug( "Control OID : " + oidValue ); } } } ); @@ -3511,7 +3511,7 @@ public class LdapMessageGrammar extends } catch ( BooleanDecoderException bde ) { - log.error( I18n + LOG.error( I18n .err( I18n.ERR_04100, StringTools.dumpBytes( value.getData() ), bde.getMessage() ) ); // This will generate a PROTOCOL_ERROR @@ -3523,7 +3523,7 @@ public class LdapMessageGrammar extends if ( IS_DEBUG ) { - log.debug( "Control criticality : " + control.isCritical() ); + LOG.debug( "Control criticality : " + control.isCritical() ); } } } ); @@ -3607,7 +3607,7 @@ public class LdapMessageGrammar extends ( ( SearchRequestImpl ) searchRequest ).setTlvId( tlv.getId() ); ldapMessageContainer.setMessage( searchRequest ); - log.debug( "Search Request" ); + LOG.debug( "Search Request" ); } } ); @@ -3650,7 +3650,7 @@ public class LdapMessageGrammar extends { String msg = "Invalid root DN given : " + dnStr + " (" + StringTools.dumpBytes( dnBytes ) + ") is invalid"; - log.error( "{} : {}", msg, ine.getMessage() ); + LOG.error( "{} : {}", msg, ine.getMessage() ); SearchResultDoneImpl response = new SearchResultDoneImpl( searchRequest.getMessageId() ); throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX, @@ -3664,7 +3664,7 @@ public class LdapMessageGrammar extends searchRequest.setBase( baseObject ); - log.debug( "Searching with root DN : {}", baseObject ); + LOG.debug( "Searching with root DN : {}", baseObject ); } } ); @@ -3704,7 +3704,7 @@ public class LdapMessageGrammar extends catch ( IntegerDecoderException ide ) { String msg = I18n.err( I18n.ERR_04101, value.toString() ); - log.error( msg ); + LOG.error( msg ); throw new DecoderException( msg ); } @@ -3715,15 +3715,15 @@ public class LdapMessageGrammar extends switch ( scope ) { case LdapConstants.SCOPE_BASE_OBJECT: - log.debug( "Searching within BASE_OBJECT scope " ); + LOG.debug( "Searching within BASE_OBJECT scope " ); break; case LdapConstants.SCOPE_SINGLE_LEVEL: - log.debug( "Searching within SINGLE_LEVEL scope " ); + LOG.debug( "Searching within SINGLE_LEVEL scope " ); break; case LdapConstants.SCOPE_WHOLE_SUBTREE: - log.debug( "Searching within WHOLE_SUBTREE scope " ); + LOG.debug( "Searching within WHOLE_SUBTREE scope " ); break; } } @@ -3767,7 +3767,7 @@ public class LdapMessageGrammar extends catch ( IntegerDecoderException ide ) { String msg = I18n.err( I18n.ERR_04102, value.toString() ); - log.error( msg ); + LOG.error( msg ); throw new DecoderException( msg ); } @@ -3778,19 +3778,19 @@ public class LdapMessageGrammar extends switch ( derefAliases ) { case LdapConstants.NEVER_DEREF_ALIASES: - log.debug( "Handling object strategy : NEVER_DEREF_ALIASES" ); + LOG.debug( "Handling object strategy : NEVER_DEREF_ALIASES" ); break; case LdapConstants.DEREF_IN_SEARCHING: - log.debug( "Handling object strategy : DEREF_IN_SEARCHING" ); + LOG.debug( "Handling object strategy : DEREF_IN_SEARCHING" ); break; case LdapConstants.DEREF_FINDING_BASE_OBJ: - log.debug( "Handling object strategy : DEREF_FINDING_BASE_OBJ" ); + LOG.debug( "Handling object strategy : DEREF_FINDING_BASE_OBJ" ); break; case LdapConstants.DEREF_ALWAYS: - log.debug( "Handling object strategy : DEREF_ALWAYS" ); + LOG.debug( "Handling object strategy : DEREF_ALWAYS" ); break; } } @@ -3830,7 +3830,7 @@ public class LdapMessageGrammar extends catch ( LongDecoderException lde ) { String msg = I18n.err( I18n.ERR_04103, value.toString() ); - log.error( msg ); + LOG.error( msg ); throw new DecoderException( msg ); } @@ -3838,7 +3838,7 @@ public class LdapMessageGrammar extends if ( IS_DEBUG ) { - log.debug( "The sizeLimit value is set to {} objects", Long.valueOf( sizeLimit ) ); + LOG.debug( "The sizeLimit value is set to {} objects", Long.valueOf( sizeLimit ) ); } } } ); @@ -3877,7 +3877,7 @@ public class LdapMessageGrammar extends catch ( IntegerDecoderException ide ) { String msg = I18n.err( I18n.ERR_04104, value.toString() ); - log.error( msg ); + LOG.error( msg ); throw new DecoderException( msg ); } @@ -3885,7 +3885,7 @@ public class LdapMessageGrammar extends if ( IS_DEBUG ) { - log.debug( "The timeLimit value is set to {} seconds", Integer.valueOf( timeLimit ) ); + LOG.debug( "The timeLimit value is set to {} seconds", Integer.valueOf( timeLimit ) ); } } } ); @@ -3925,7 +3925,7 @@ public class LdapMessageGrammar extends } catch ( BooleanDecoderException bde ) { - log.error( I18n + LOG.error( I18n .err( I18n.ERR_04105, StringTools.dumpBytes( value.getData() ), bde.getMessage() ) ); throw new DecoderException( bde.getMessage() ); @@ -3933,7 +3933,7 @@ public class LdapMessageGrammar extends if ( IS_DEBUG ) { - log.debug( "The search will return {}", ( searchRequest.getTypesOnly() ? "only attributs type" + LOG.debug( "The search will return {}", ( searchRequest.getTypesOnly() ? "only attributs type" : "attributes types and values" ) ); } } @@ -5059,7 +5059,7 @@ public class LdapMessageGrammar extends if ( tlv.getLength() == 0 ) { String msg = I18n.err( I18n.ERR_04106 ); - log.error( msg ); + LOG.error( msg ); throw new DecoderException( msg ); } else @@ -5100,7 +5100,7 @@ public class LdapMessageGrammar extends if ( tlv.getLength() == 0 ) { - log.error( I18n.err( I18n.ERR_04107 ) ); + LOG.error( I18n.err( I18n.ERR_04107 ) ); throw new DecoderException( "The substring sequence is empty" ); } } @@ -5134,7 +5134,7 @@ public class LdapMessageGrammar extends if ( tlv.getLength() == 0 ) { String msg = I18n.err( I18n.ERR_04108 ); - log.error( msg ); + LOG.error( msg ); throw new DecoderException( msg ); } @@ -6056,7 +6056,7 @@ public class LdapMessageGrammar extends if ( tlv.getLength() == 0 ) { String msg = I18n.err( I18n.ERR_04109 ); - log.error( msg ); + LOG.error( msg ); // It will generate a PROTOCOL_ERROR throw new DecoderException( I18n.err( I18n.ERR_04109 ) ); @@ -6194,7 +6194,7 @@ public class LdapMessageGrammar extends } catch ( BooleanDecoderException bde ) { - log.error( I18n + LOG.error( I18n .err( I18n.ERR_04110, StringTools.dumpBytes( value.getData() ), bde.getMessage() ) ); throw new DecoderException( bde.getMessage() ); @@ -6202,7 +6202,7 @@ public class LdapMessageGrammar extends if ( IS_DEBUG ) { - log.debug( "DN Attributes : {}", Boolean.valueOf( extensibleMatchFilter.isDnAttributes() ) ); + LOG.debug( "DN Attributes : {}", Boolean.valueOf( extensibleMatchFilter.isDnAttributes() ) ); } // unstack the filters if needed Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapStatesEnum.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapStatesEnum.java?rev=1004064&r1=1004063&r2=1004064&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapStatesEnum.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapStatesEnum.java Sun Oct 3 22:43:50 2010 @@ -157,7 +157,7 @@ public class LdapStatesEnum implements S // States debug strings // ========================================================================= /** A string representation of all the states */ - private static String[] LdapMessageString = new String[] + private static final String[] LDAP_MESSAGE_STRING = new String[] { "START_STATE", "LDAP_MESSAGE_STATE", @@ -348,6 +348,6 @@ public class LdapStatesEnum implements S */ public String getState( int state ) { - return ( ( state == GRAMMAR_END ) ? "LDAP_MESSAGE_END_STATE" : LdapMessageString[state] ); + return ( ( state == GRAMMAR_END ) ? "LDAP_MESSAGE_END_STATE" : LDAP_MESSAGE_STRING[state] ); } } Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/AttributeDescAction.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/AttributeDescAction.java?rev=1004064&r1=1004063&r2=1004064&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/AttributeDescAction.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/AttributeDescAction.java Sun Oct 3 22:43:50 2010 @@ -39,12 +39,15 @@ import org.slf4j.LoggerFactory; public class AttributeDescAction extends GrammarAction { /** The logger */ - private static final Logger log = LoggerFactory.getLogger( AttributeDescAction.class ); + private static final Logger LOG = LoggerFactory.getLogger( AttributeDescAction.class ); /** Speedup for logs */ - private static final boolean IS_DEBUG = log.isDebugEnabled(); + private static final boolean IS_DEBUG = LOG.isDebugEnabled(); + /** + * Instantiates a new attribute desc action. + */ public AttributeDescAction() { super( "Store attribute description" ); @@ -52,7 +55,7 @@ public class AttributeDescAction extends /** - * The initialization action + * {@inheritDoc} */ public void action( Asn1Container container ) throws DecoderException { @@ -79,7 +82,7 @@ public class AttributeDescAction extends if ( IS_DEBUG ) { - log.debug( "Decoded Attribute Description : {}", attributeDescription ); + LOG.debug( "Decoded Attribute Description : {}", attributeDescription ); } } } Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java?rev=1004064&r1=1004063&r2=1004064&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java Sun Oct 3 22:43:50 2010 @@ -45,12 +45,15 @@ import org.slf4j.LoggerFactory; public class ControlValueAction extends GrammarAction { /** The logger */ - private static final Logger log = LoggerFactory.getLogger( ControlValueAction.class ); + private static final Logger LOG = LoggerFactory.getLogger( ControlValueAction.class ); /** Speedup for logs */ - private static final boolean IS_DEBUG = log.isDebugEnabled(); + private static final boolean IS_DEBUG = LOG.isDebugEnabled(); + /** + * {@inheritDoc} + */ public void action( Asn1Container container ) throws DecoderException { LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container; @@ -85,7 +88,7 @@ public class ControlValueAction extends if ( IS_DEBUG ) { - log.debug( "Control value : " + StringTools.dumpBytes( ( byte[] ) control.getValue() ) ); + LOG.debug( "Control value : " + StringTools.dumpBytes( ( byte[] ) control.getValue() ) ); } } } Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlsInitAction.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlsInitAction.java?rev=1004064&r1=1004063&r2=1004064&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlsInitAction.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlsInitAction.java Sun Oct 3 22:43:50 2010 @@ -37,12 +37,15 @@ import org.slf4j.LoggerFactory; public class ControlsInitAction extends GrammarAction { /** The logger */ - private static final Logger log = LoggerFactory.getLogger( ControlsInitAction.class ); + private static final Logger LOG = LoggerFactory.getLogger( ControlsInitAction.class ); /** Speedup for logs */ - private static final boolean IS_DEBUG = log.isDebugEnabled(); + private static final boolean IS_DEBUG = LOG.isDebugEnabled(); + /** + * Instantiates a new controls init action. + */ public ControlsInitAction() { super( "Initialize a control" ); @@ -50,7 +53,7 @@ public class ControlsInitAction extends /** - * The initialization action + * {@inheritDoc} */ public void action( Asn1Container container ) throws DecoderException { @@ -63,7 +66,7 @@ public class ControlsInitAction extends // The Length should be null if ( expectedLength == 0 ) { - log.error( "The length of controls must not be null" ); + LOG.error( "The length of controls must not be null" ); // This will generate a PROTOCOL_ERROR throw new DecoderException( "The length of controls must not be null" ); @@ -71,7 +74,7 @@ public class ControlsInitAction extends if ( IS_DEBUG ) { - log.debug( "A new list of controls has been initialized" ); + LOG.debug( "A new list of controls has been initialized" ); } } } Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ErrorMessageAction.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ErrorMessageAction.java?rev=1004064&r1=1004063&r2=1004064&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ErrorMessageAction.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ErrorMessageAction.java Sun Oct 3 22:43:50 2010 @@ -40,12 +40,15 @@ import org.slf4j.LoggerFactory; public class ErrorMessageAction extends GrammarAction { /** The logger */ - private static final Logger log = LoggerFactory.getLogger( ErrorMessageAction.class ); + private static final Logger LOG = LoggerFactory.getLogger( ErrorMessageAction.class ); /** Speedup for logs */ - private static final boolean IS_DEBUG = log.isDebugEnabled(); + private static final boolean IS_DEBUG = LOG.isDebugEnabled(); + /** + * Instantiates a new error message action. + */ public ErrorMessageAction() { super( "Store error message" ); @@ -53,7 +56,7 @@ public class ErrorMessageAction extends /** - * The initialization action + * {@inheritDoc} */ public void action( Asn1Container container ) throws DecoderException { @@ -83,7 +86,7 @@ public class ErrorMessageAction extends if ( IS_DEBUG ) { - log.debug( "The error message is : " + errorMessage ); + LOG.debug( "The error message is : " + errorMessage ); } } } Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAndFilterAction.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAndFilterAction.java?rev=1004064&r1=1004063&r2=1004064&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAndFilterAction.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAndFilterAction.java Sun Oct 3 22:43:50 2010 @@ -42,12 +42,15 @@ import org.slf4j.LoggerFactory; public class InitAndFilterAction extends GrammarAction { /** The logger */ - private static final Logger log = LoggerFactory.getLogger( InitAndFilterAction.class ); + private static final Logger LOG = LoggerFactory.getLogger( InitAndFilterAction.class ); /** Speedup for logs */ - private static final boolean IS_DEBUG = log.isDebugEnabled(); + private static final boolean IS_DEBUG = LOG.isDebugEnabled(); + /** + * Instantiates a new init AND filter action. + */ public InitAndFilterAction() { super( "Initialize AND filter" ); @@ -55,7 +58,7 @@ public class InitAndFilterAction extends /** - * The initialization action + * {@inheritDoc} */ public void action( Asn1Container container ) throws DecoderException { @@ -66,7 +69,7 @@ public class InitAndFilterAction extends if ( tlv.getLength() == 0 ) { String msg = I18n.err( I18n.ERR_04006 ); - log.error( msg ); + LOG.error( msg ); throw new DecoderException( msg ); } @@ -80,7 +83,7 @@ public class InitAndFilterAction extends if ( IS_DEBUG ) { - log.debug( "Initialize AND filter" ); + LOG.debug( "Initialize AND filter" ); } } } Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitApproxMatchFilterAction.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitApproxMatchFilterAction.java?rev=1004064&r1=1004063&r2=1004064&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitApproxMatchFilterAction.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitApproxMatchFilterAction.java Sun Oct 3 22:43:50 2010 @@ -41,18 +41,24 @@ import org.slf4j.LoggerFactory; public class InitApproxMatchFilterAction extends GrammarAction { /** The logger */ - private static final Logger log = LoggerFactory.getLogger( InitApproxMatchFilterAction.class ); + private static final Logger LOG = LoggerFactory.getLogger( InitApproxMatchFilterAction.class ); /** Speedup for logs */ - private static final boolean IS_DEBUG = log.isDebugEnabled(); + private static final boolean IS_DEBUG = LOG.isDebugEnabled(); + /** + * Instantiates a new init approx match filter action. + */ public InitApproxMatchFilterAction() { super( "Init Approx Match filter Value" ); } + /** + * {@inheritDoc} + */ public void action( Asn1Container container ) throws DecoderException { LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container; @@ -70,7 +76,7 @@ public class InitApproxMatchFilterAction if ( IS_DEBUG ) { - log.debug( "Initialize Approx Match filter" ); + LOG.debug( "Initialize Approx Match filter" ); } } } Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAssertionValueFilterAction.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAssertionValueFilterAction.java?rev=1004064&r1=1004063&r2=1004064&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAssertionValueFilterAction.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAssertionValueFilterAction.java Sun Oct 3 22:43:50 2010 @@ -45,12 +45,15 @@ import org.slf4j.LoggerFactory; public class InitAssertionValueFilterAction extends GrammarAction { /** The logger */ - private static final Logger log = LoggerFactory.getLogger( InitAssertionValueFilterAction.class ); + private static final Logger LOG = LoggerFactory.getLogger( InitAssertionValueFilterAction.class ); /** Speedup for logs */ - private static final boolean IS_DEBUG = log.isDebugEnabled(); + private static final boolean IS_DEBUG = LOG.isDebugEnabled(); + /** + * Instantiates a new init assertion value filter action. + */ public InitAssertionValueFilterAction() { super( "Initialize Assertion Value filter" ); @@ -58,7 +61,7 @@ public class InitAssertionValueFilterAct /** - * The initialization action + * {@inheritDoc} */ public void action( Asn1Container container ) throws DecoderException { @@ -116,7 +119,7 @@ public class InitAssertionValueFilterAct if ( IS_DEBUG ) { - log.debug( "Initialize Assertion Value filter" ); + LOG.debug( "Initialize Assertion Value filter" ); } } } Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAttributeDescFilterAction.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAttributeDescFilterAction.java?rev=1004064&r1=1004063&r2=1004064&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAttributeDescFilterAction.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAttributeDescFilterAction.java Sun Oct 3 22:43:50 2010 @@ -43,12 +43,15 @@ import org.slf4j.LoggerFactory; public class InitAttributeDescFilterAction extends GrammarAction { /** The logger */ - private static final Logger log = LoggerFactory.getLogger( InitAttributeDescFilterAction.class ); + private static final Logger LOG = LoggerFactory.getLogger( InitAttributeDescFilterAction.class ); /** Speedup for logs */ - private static final boolean IS_DEBUG = log.isDebugEnabled(); + private static final boolean IS_DEBUG = LOG.isDebugEnabled(); + /** + * Instantiates a new init attribute desc filter action. + */ public InitAttributeDescFilterAction() { super( "Initialize AttributeDesc filter" ); @@ -56,7 +59,7 @@ public class InitAttributeDescFilterActi /** - * The initialization action + * {@inheritDoc} */ public void action( Asn1Container container ) throws DecoderException { @@ -70,7 +73,7 @@ public class InitAttributeDescFilterActi if ( tlv.getLength() == 0 ) { String msg = I18n.err( I18n.ERR_04007 ); - log.error( msg ); + LOG.error( msg ); throw new DecoderException( msg ); } else @@ -85,7 +88,7 @@ public class InitAttributeDescFilterActi if ( IS_DEBUG ) { - log.debug( "Initialize AttributeDesc filter" ); + LOG.debug( "Initialize AttributeDesc filter" ); } } } Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAttributeDescListAction.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAttributeDescListAction.java?rev=1004064&r1=1004063&r2=1004064&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAttributeDescListAction.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAttributeDescListAction.java Sun Oct 3 22:43:50 2010 @@ -37,18 +37,21 @@ import org.slf4j.LoggerFactory; public class InitAttributeDescListAction extends GrammarAction { /** The logger */ - private static final Logger log = LoggerFactory.getLogger( InitAttributeDescListAction.class ); + private static final Logger LOG = LoggerFactory.getLogger( InitAttributeDescListAction.class ); /** Speedup for logs */ - private static final boolean IS_DEBUG = log.isDebugEnabled(); + private static final boolean IS_DEBUG = LOG.isDebugEnabled(); + /** + * Instantiates a new init attribute desc list action. + */ public InitAttributeDescListAction() { super( "Initialize AttributeDesc list" ); } /** - * The initialization action + * {@inheritDoc} */ public void action( Asn1Container container ) throws DecoderException { @@ -59,7 +62,7 @@ public class InitAttributeDescListAction if ( IS_DEBUG ) { - log.debug( "Initialize AttributeDesc list" ); + LOG.debug( "Initialize AttributeDesc list" ); } } } Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitEqualityMatchFilterAction.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitEqualityMatchFilterAction.java?rev=1004064&r1=1004063&r2=1004064&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitEqualityMatchFilterAction.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitEqualityMatchFilterAction.java Sun Oct 3 22:43:50 2010 @@ -41,12 +41,15 @@ import org.slf4j.LoggerFactory; public class InitEqualityMatchFilterAction extends GrammarAction { /** The logger */ - private static final Logger log = LoggerFactory.getLogger( InitEqualityMatchFilterAction.class ); + private static final Logger LOG = LoggerFactory.getLogger( InitEqualityMatchFilterAction.class ); /** Speedup for logs */ - private static final boolean IS_DEBUG = log.isDebugEnabled(); + private static final boolean IS_DEBUG = LOG.isDebugEnabled(); + /** + * Instantiates a new init equality match filter action. + */ public InitEqualityMatchFilterAction() { super( "Initialize Equality Match filter" ); @@ -54,7 +57,7 @@ public class InitEqualityMatchFilterActi /** - * The initialization action + * {@inheritDoc} */ public void action( Asn1Container container ) throws DecoderException { @@ -73,7 +76,7 @@ public class InitEqualityMatchFilterActi if ( IS_DEBUG ) { - log.debug( "Initialize Equality Match filter" ); + LOG.debug( "Initialize Equality Match filter" ); } } } Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitExtensibleMatchFilterAction.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitExtensibleMatchFilterAction.java?rev=1004064&r1=1004063&r2=1004064&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitExtensibleMatchFilterAction.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitExtensibleMatchFilterAction.java Sun Oct 3 22:43:50 2010 @@ -40,18 +40,24 @@ import org.slf4j.LoggerFactory; public class InitExtensibleMatchFilterAction extends GrammarAction { /** The logger */ - private static final Logger log = LoggerFactory.getLogger( InitExtensibleMatchFilterAction.class ); + private static final Logger LOG = LoggerFactory.getLogger( InitExtensibleMatchFilterAction.class ); /** Speedup for logs */ - private static final boolean IS_DEBUG = log.isDebugEnabled(); + private static final boolean IS_DEBUG = LOG.isDebugEnabled(); + /** + * Instantiates a new init extensible match filter action. + */ public InitExtensibleMatchFilterAction() { super( "Init Extensible Match filter Value" ); } + /** + * {@inheritDoc} + */ public void action( Asn1Container container ) throws DecoderException { LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container; @@ -65,7 +71,7 @@ public class InitExtensibleMatchFilterAc if ( IS_DEBUG ) { - log.debug( "Initialize Extensible Match filter" ); + LOG.debug( "Initialize Extensible Match filter" ); } } } Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitGreaterOrEqualFilterAction.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitGreaterOrEqualFilterAction.java?rev=1004064&r1=1004063&r2=1004064&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitGreaterOrEqualFilterAction.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitGreaterOrEqualFilterAction.java Sun Oct 3 22:43:50 2010 @@ -41,12 +41,15 @@ import org.slf4j.LoggerFactory; public class InitGreaterOrEqualFilterAction extends GrammarAction { /** The logger */ - private static final Logger log = LoggerFactory.getLogger( InitGreaterOrEqualFilterAction.class ); + private static final Logger LOG = LoggerFactory.getLogger( InitGreaterOrEqualFilterAction.class ); /** Speedup for logs */ - private static final boolean IS_DEBUG = log.isDebugEnabled(); + private static final boolean IS_DEBUG = LOG.isDebugEnabled(); + /** + * Instantiates a new init greater or equal filter action. + */ public InitGreaterOrEqualFilterAction() { super( "Initialize Greater Or Equal filter" ); @@ -54,7 +57,7 @@ public class InitGreaterOrEqualFilterAct /** - * The initialization action + * {@inheritDoc} */ public void action( Asn1Container container ) throws DecoderException { @@ -73,7 +76,7 @@ public class InitGreaterOrEqualFilterAct if ( IS_DEBUG ) { - log.debug( "Initialize Greater Or Equal filter" ); + LOG.debug( "Initialize Greater Or Equal filter" ); } } } Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitLessOrEqualFilterAction.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitLessOrEqualFilterAction.java?rev=1004064&r1=1004063&r2=1004064&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitLessOrEqualFilterAction.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitLessOrEqualFilterAction.java Sun Oct 3 22:43:50 2010 @@ -41,12 +41,15 @@ import org.slf4j.LoggerFactory; public class InitLessOrEqualFilterAction extends GrammarAction { /** The logger */ - private static final Logger log = LoggerFactory.getLogger( InitLessOrEqualFilterAction.class ); + private static final Logger LOG = LoggerFactory.getLogger( InitLessOrEqualFilterAction.class ); /** Speedup for logs */ - private static final boolean IS_DEBUG = log.isDebugEnabled(); + private static final boolean IS_DEBUG = LOG.isDebugEnabled(); + /** + * Instantiates a new init less or equal filter action. + */ public InitLessOrEqualFilterAction() { super( "Initialize Less Or Equal filter" ); @@ -54,7 +57,7 @@ public class InitLessOrEqualFilterAction /** - * The initialization action + * {@inheritDoc} */ public void action( Asn1Container container ) throws DecoderException { @@ -73,7 +76,7 @@ public class InitLessOrEqualFilterAction if ( IS_DEBUG ) { - log.debug( "Initialize Less Or Equal filter" ); + LOG.debug( "Initialize Less Or Equal filter" ); } } } Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitNotFilterAction.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitNotFilterAction.java?rev=1004064&r1=1004063&r2=1004064&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitNotFilterAction.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitNotFilterAction.java Sun Oct 3 22:43:50 2010 @@ -42,12 +42,15 @@ import org.slf4j.LoggerFactory; public class InitNotFilterAction extends GrammarAction { /** The logger */ - private static final Logger log = LoggerFactory.getLogger( InitNotFilterAction.class ); + private static final Logger LOG = LoggerFactory.getLogger( InitNotFilterAction.class ); /** Speedup for logs */ - private static final boolean IS_DEBUG = log.isDebugEnabled(); + private static final boolean IS_DEBUG = LOG.isDebugEnabled(); + /** + * Instantiates a new init NOT filter action. + */ public InitNotFilterAction() { super( "Initialize NOT filter" ); @@ -55,7 +58,7 @@ public class InitNotFilterAction extends /** - * The initialization action + * {@inheritDoc} */ public void action( Asn1Container container ) throws DecoderException { @@ -66,7 +69,7 @@ public class InitNotFilterAction extends if ( tlv.getLength() == 0 ) { String msg = I18n.err( I18n.ERR_04009 ); - log.error( msg ); + LOG.error( msg ); throw new DecoderException( msg ); } @@ -80,7 +83,7 @@ public class InitNotFilterAction extends if ( IS_DEBUG ) { - log.debug( "Initialize NOT filter" ); + LOG.debug( "Initialize NOT filter" ); } } } Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitOrFilterAction.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitOrFilterAction.java?rev=1004064&r1=1004063&r2=1004064&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitOrFilterAction.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitOrFilterAction.java Sun Oct 3 22:43:50 2010 @@ -42,12 +42,15 @@ import org.slf4j.LoggerFactory; public class InitOrFilterAction extends GrammarAction { /** The logger */ - private static final Logger log = LoggerFactory.getLogger( InitOrFilterAction.class ); + private static final Logger LOG = LoggerFactory.getLogger( InitOrFilterAction.class ); /** Speedup for logs */ - private static final boolean IS_DEBUG = log.isDebugEnabled(); + private static final boolean IS_DEBUG = LOG.isDebugEnabled(); + /** + * Instantiates a new init OR filter action. + */ public InitOrFilterAction() { super( "Initialize OR filter" ); @@ -55,7 +58,7 @@ public class InitOrFilterAction extends /** - * The initialization action + * {@inheritDoc} */ public void action( Asn1Container container ) throws DecoderException { @@ -66,7 +69,7 @@ public class InitOrFilterAction extends if ( tlv.getLength() == 0 ) { String msg = I18n.err( I18n.ERR_04010 ); - log.error( msg ); + LOG.error( msg ); throw new DecoderException( msg ); } @@ -80,7 +83,7 @@ public class InitOrFilterAction extends if ( IS_DEBUG ) { - log.debug( "Initialize OR filter" ); + LOG.debug( "Initialize OR filter" ); } } }