directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r944575 - in /directory/shared/trunk: ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/ ldap/src/main/java/org/apache/directory/shared/ldap/codec/ ldap/src/main/java/org/apache/directory/shared/ldap/schema/
Date Sat, 15 May 2010 05:59:05 GMT
Author: felixk
Date: Sat May 15 05:59:04 2010
New Revision: 944575

URL: http://svn.apache.org/viewvc?rev=944575&view=rev
Log:
>From PMD report "Avoid unnecessary return statements"

Missed some

Modified:
    directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.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/schema/PrepareString.java

Modified: directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java?rev=944575&r1=944574&r2=944575&view=diff
==============================================================================
--- directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java
(original)
+++ directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java
Sat May 15 05:59:04 2010
@@ -990,8 +990,6 @@ public class LdifReader implements Itera
             LOG.error( I18n.err( I18n.ERR_12038 ) );
             throw new LdapLdifException( I18n.err( I18n.ERR_12039 ) );
         }
-
-        return;
     }
 
 
@@ -1555,8 +1553,6 @@ public class LdifReader implements Itera
         {
             lines.add( sb.toString() );
         }
-
-        return;
     }
 
 

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=944575&r1=944574&r2=944575&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
Sat May 15 05:59:04 2010
@@ -184,8 +184,6 @@ public class LdapMessageGrammar extends 
                         // This will generate a PROTOCOL_ERROR
                         throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
                     }
-
-                    return;
                 }
             } );
 
@@ -244,8 +242,6 @@ public class LdapMessageGrammar extends 
                         // This will generate a PROTOCOL_ERROR                        
                         throw new DecoderException( ide.getMessage() );
                     }
-
-                    return;
                 }
             } );
 
@@ -310,8 +306,6 @@ public class LdapMessageGrammar extends 
                     
                     // We can quit now
                     ldapMessageContainer.grammarEndAllowed( true );
-
-                    return;
                 }
             } );
 
@@ -552,8 +546,6 @@ public class LdapMessageGrammar extends 
                         // This will generate a PROTOCOL_ERROR
                         throw new DecoderException( ide.getMessage() );
                     }
-
-                    return;
                 }
             } );
 
@@ -610,8 +602,6 @@ public class LdapMessageGrammar extends 
                     {
                         log.debug( " The Bind name is {}", bindRequestMessage.getName() );
                     }
-
-                    return;
                 }
             } );
 
@@ -724,8 +714,6 @@ public class LdapMessageGrammar extends 
                     {
                         log.debug( "The SaslCredential has been created" );
                     }
-
-                    return;
                 }
             } );
 
@@ -768,8 +756,6 @@ public class LdapMessageGrammar extends 
                     {
                         log.debug( "The mechanism is : {}", authentication.getMechanism()
);
                     }
-
-                    return;
                 }
             } );
 
@@ -813,8 +799,6 @@ public class LdapMessageGrammar extends 
                     {
                         log.debug( "The credentials are : {}", credentials.getCredentials()
);
                     }
-
-                    return;
                 }
             } );
 
@@ -2233,8 +2217,6 @@ public class LdapMessageGrammar extends 
                     {
                         log.debug( "Modifying DN {}", entry );
                     }
-
-                    return;
                 }
             } );
 
@@ -2433,8 +2415,6 @@ public class LdapMessageGrammar extends 
                     {
                         log.debug( "New superior DN {}", newSuperior );
                     }
-
-                    return;
                 }
             } );
 
@@ -3678,8 +3658,6 @@ public class LdapMessageGrammar extends 
                     searchRequest.setBaseObject( baseObject );
 
                     log.debug( "Searching with root DN : {}", baseObject );
-
-                    return;
                 }
             } );
 
@@ -3741,8 +3719,6 @@ public class LdapMessageGrammar extends 
                                 break;
                         }
                     }
-
-                    return;
                 }
             } );
 
@@ -3809,7 +3785,6 @@ public class LdapMessageGrammar extends 
                                 break;
                         }
                     }
-                    return;
                 }
             } );
 
@@ -3855,8 +3830,6 @@ public class LdapMessageGrammar extends 
                     {
                         log.debug( "The sizeLimit value is set to {} objects", Long.valueOf(
sizeLimit ) );
                     }
-
-                    return;
                 }
             } );
 
@@ -3903,8 +3876,6 @@ public class LdapMessageGrammar extends 
                     {
                         log.debug( "The timeLimit value is set to {} seconds", Integer.valueOf(
timeLimit ) );
                     }
-
-                    return;
                 }
             } );
 
@@ -3953,7 +3924,6 @@ public class LdapMessageGrammar extends 
                         log.debug( "The search will return {}", ( searchRequest.isTypesOnly()
? "only attributs type"
                             : "attributes types and values" ) );
                     }
-                    return;
                 }
             } );
 

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/PrepareString.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/PrepareString.java?rev=944575&r1=944574&r2=944575&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/PrepareString.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/PrepareString.java
Sat May 15 05:59:04 2010
@@ -4552,8 +4552,6 @@ public class PrepareString
         {
             throw new InvalidCharacterException( c );
         }
-        
-        return;
     }
     
     /**



Mime
View raw message