directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r369806 - in /directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec: del/ extended/ modify/
Date Tue, 17 Jan 2006 15:01:52 GMT
Author: elecharny
Date: Tue Jan 17 07:01:45 2006
New Revision: 369806

URL: http://svn.apache.org/viewcvs?rev=369806&view=rev
Log:
- Modified logs

Modified:
    directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/del/DelRequestGrammar.java
    directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/del/DelResponseGrammar.java
    directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/extended/ExtendedResponseGrammar.java
    directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/modify/ModifyRequest.java
    directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/modify/ModifyRequestGrammar.java
    directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/modify/ModifyResponseGrammar.java

Modified: directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/del/DelRequestGrammar.java
URL: http://svn.apache.org/viewcvs/directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/del/DelRequestGrammar.java?rev=369806&r1=369805&r2=369806&view=diff
==============================================================================
--- directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/del/DelRequestGrammar.java
(original)
+++ directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/del/DelRequestGrammar.java
Tue Jan 17 07:01:45 2006
@@ -115,13 +115,13 @@
                             catch ( InvalidNameException ine )
                             {
                             	String msg = "The DN to delete  (" + StringTools.dumpBytes(
tlv.getValue().getData() ) + ") is invalid"; 
-                                log.error( msg + " : " + ine.getMessage());
+                                log.error( "{} : {}", msg, ine.getMessage());
                                 throw new DecoderException( msg, ine );
                             }
                             catch ( NamingException ne )
                             {
                             	String msg = "The DN to delete  (" + StringTools.dumpBytes(
tlv.getValue().getData() ) + ") is invalid";
-                                log.error( msg + " : " + ne.getMessage() );
+                                log.error( "{} : {}", msg, ne.getMessage() );
                                 throw new DecoderException( msg, ne );
                             }
 
@@ -136,7 +136,7 @@
                         
                         if ( log.isDebugEnabled() )
                         {
-                            log.debug( "Deleting DN " + entry );
+                            log.debug( "Deleting DN {}", entry );
                         }
                     }
                 } );

Modified: directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/del/DelResponseGrammar.java
URL: http://svn.apache.org/viewcvs/directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/del/DelResponseGrammar.java?rev=369806&r1=369805&r2=369806&view=diff
==============================================================================
--- directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/del/DelResponseGrammar.java
(original)
+++ directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/del/DelResponseGrammar.java
Tue Jan 17 07:01:45 2006
@@ -89,10 +89,7 @@
                         // And we associate it to the ldapMessage Object
                         ldapMessage.setProtocolOP( new DelResponse() );
                         
-                        if ( log.isDebugEnabled() )
-                        {
-                            log.debug( "Del response " );
-                        }
+                        log.debug( "Del response " );
                     }
                 } );
 

Modified: directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/extended/ExtendedResponseGrammar.java
URL: http://svn.apache.org/viewcvs/directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/extended/ExtendedResponseGrammar.java?rev=369806&r1=369805&r2=369806&view=diff
==============================================================================
--- directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/extended/ExtendedResponseGrammar.java
(original)
+++ directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/extended/ExtendedResponseGrammar.java
Tue Jan 17 07:01:45 2006
@@ -199,7 +199,7 @@
 
                         if ( log.isDebugEnabled() )
                         {
-                            log.debug( "Extended value : {}" + extendedResponse.getResponse()
);
+                            log.debug( "Extended value : {}", extendedResponse.getResponse()
);
                         }
                     }
                 } );

Modified: directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/modify/ModifyRequest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/modify/ModifyRequest.java?rev=369806&r1=369805&r2=369806&view=diff
==============================================================================
--- directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/modify/ModifyRequest.java
(original)
+++ directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/modify/ModifyRequest.java
Tue Jan 17 07:01:45 2006
@@ -570,8 +570,7 @@
                 }
                 catch ( NamingException ne )
                 {
-                    log.error( "Naming exception while printing the '" + attribute.getID()
+
-                        "'" );
+                    log.error( "Naming exception while printing the '{}'", attribute.getID()
);
                 }
             }
         }

Modified: directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/modify/ModifyRequestGrammar.java
URL: http://svn.apache.org/viewcvs/directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/modify/ModifyRequestGrammar.java?rev=369806&r1=369805&r2=369806&view=diff
==============================================================================
--- directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/modify/ModifyRequestGrammar.java
(original)
+++ directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/modify/ModifyRequestGrammar.java
Tue Jan 17 07:01:45 2006
@@ -151,13 +151,13 @@
                             catch ( InvalidNameException ine )
                             {
                             	String msg = "Invalid DN " + StringTools.dumpBytes( tlv.getValue().getData()
) + ", : " + ine.getMessage(); 
-                                log.error( msg + " : " + ine.getMessage());
+                                log.error( "{} : {}", msg, ine.getMessage());
                                 throw new DecoderException( msg, ine );
                             }
                             catch ( NamingException ne )
                             {
                             	String msg = "Invalid DN " + StringTools.dumpBytes( tlv.getValue().getData()
) + ", : " + ne.getMessage();
-                                log.error( msg + " : " + ne.getMessage() );
+                                log.error( "{} : {}", msg, ne.getMessage() );
                                 throw new DecoderException( msg, ne );
                             }
 
@@ -166,7 +166,7 @@
                         
                         if ( log.isDebugEnabled() )
                         {
-                            log.debug( "Modification of DN " + modifyRequest.getObject()
);
+                            log.debug( "Modification of DN {}", modifyRequest.getObject()
);
                         }
                     }
                 } );
@@ -286,8 +286,9 @@
                         }
                         catch ( IntegerDecoderException ide )
                         {
-                            log.error( "Invalid operation (" + StringTools.dumpBytes( tlv.getValue().getData()
) + ", it should be 0, 1 or 2 " );
-                            throw new DecoderException( "Invalid operation (" + StringTools.dumpBytes(
tlv.getValue().getData() ) + ", it should be 0, 1 or 2 " );
+                        	String msg = "Invalid operation ({}), it should be 0, 1 or 2" +
StringTools.dumpBytes( tlv.getValue().getData() );
+                            log.error( msg );
+                            throw new DecoderException( msg );
                         }
                         
                         // Store the current operation.
@@ -380,14 +381,14 @@
                             }
                             catch ( LdapStringEncodingException lsee )
                             {
-                                log.error( "Invalid type : " + StringTools.dumpBytes( tlv.getValue().getData()
) );
+                                log.error( "Invalid type : {}", StringTools.dumpBytes( tlv.getValue().getData()
) );
                                 throw new DecoderException( "Invalid type : " + lsee.getMessage()
);
                             }
                         }
                         
                         if ( log.isDebugEnabled() )
                         {
-                            log.debug( "Modifying type : " + type );
+                            log.debug( "Modifying type : {}", type );
                         }
                     }
                 } );
@@ -484,10 +485,7 @@
                         // We can have an END transition
                         ldapMessageContainer.grammarEndAllowed( true );
                         
-                        if ( log.isDebugEnabled() )
-                        {
-                            log.debug( "Value modified : " + value );
-                        }
+                        log.debug( "Value modified : {}", value );
                     }
                 } );
 

Modified: directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/modify/ModifyResponseGrammar.java
URL: http://svn.apache.org/viewcvs/directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/modify/ModifyResponseGrammar.java?rev=369806&r1=369805&r2=369806&view=diff
==============================================================================
--- directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/modify/ModifyResponseGrammar.java
(original)
+++ directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/modify/ModifyResponseGrammar.java
Tue Jan 17 07:01:45 2006
@@ -87,10 +87,7 @@
                         // We associate it to the ldapMessage Object
                         ldapMessage.setProtocolOP( new ModifyResponse() );
                         
-                        if ( log.isDebugEnabled() )
-                        {
-                            log.debug( "Modify response" );
-                        }
+                        log.debug( "Modify response" );
                     }
                 } );
 



Mime
View raw message