You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2015/09/10 23:39:08 UTC

svn commit: r1702323 - /directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifReader.java

Author: elecharny
Date: Thu Sep 10 21:39:08 2015
New Revision: 1702323

URL: http://svn.apache.org/r1702323
Log:
o Fix for DIRAPI-248 
o Get rid of the deprecated method toLowerCase

Modified:
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifReader.java

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifReader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifReader.java?rev=1702323&r1=1702322&r2=1702323&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifReader.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifReader.java Thu Sep 10 21:39:08 2015
@@ -542,7 +542,7 @@ public class LdifReader implements Itera
     {
         ChangeType operation = ChangeType.Add;
 
-        String modOp = Strings.trim( line.substring( "changetype:".length() + 1 ) );
+        String modOp = Strings.trim( line.substring( "changetype:".length() ) );
 
         if ( "add".equalsIgnoreCase( modOp ) )
         {
@@ -580,7 +580,7 @@ public class LdifReader implements Itera
     {
         String dn;
 
-        String lowerLine = Strings.toLowerCase( line );
+        String lowerLine = Strings.toLowerCaseAscii( line );
 
         if ( lowerLine.startsWith( "dn:" ) || lowerLine.startsWith( "Dn:" ) )
         {
@@ -844,7 +844,7 @@ public class LdifReader implements Itera
      */
     private Control parseControl( String line ) throws LdapLdifException
     {
-        String lowerLine = Strings.toLowerCase( line ).trim();
+        String lowerLine = Strings.toLowerCaseAscii( line ).trim();
         char[] controlValue = line.trim().toCharArray();
         int pos = 0;
         int length = controlValue.length;
@@ -1067,7 +1067,7 @@ public class LdifReader implements Itera
         if ( iter.hasNext() )
         {
             String line = iter.next();
-            String lowerLine = Strings.toLowerCase( line );
+            String lowerLine = Strings.toLowerCaseAscii( line );
 
             if ( lowerLine.startsWith( "newrdn::" ) || lowerLine.startsWith( "newrdn:" ) )
             {
@@ -1098,7 +1098,7 @@ public class LdifReader implements Itera
         if ( iter.hasNext() )
         {
             String line = iter.next();
-            String lowerLine = Strings.toLowerCase( line );
+            String lowerLine = Strings.toLowerCaseAscii( line );
 
             if ( lowerLine.startsWith( "deleteoldrdn:" ) )
             {
@@ -1151,7 +1151,7 @@ public class LdifReader implements Itera
         while ( iter.hasNext() )
         {
             String line = iter.next();
-            String lowerLine = Strings.toLowerCase( line );
+            String lowerLine = Strings.toLowerCaseAscii( line );
 
             if ( lowerLine.startsWith( "-" ) )
             {
@@ -1335,7 +1335,7 @@ public class LdifReader implements Itera
                 while ( iter.hasNext() )
                 {
                     String line = iter.next();
-                    String lowerLine = Strings.toLowerCase( line );
+                    String lowerLine = Strings.toLowerCaseAscii( line );
                     parseAttributeValue( entry, line, lowerLine );
                 }
 
@@ -1356,7 +1356,7 @@ public class LdifReader implements Itera
                 if ( iter.hasNext() )
                 {
                     String line = iter.next();
-                    String lowerLine = Strings.toLowerCase( line );
+                    String lowerLine = Strings.toLowerCaseAscii( line );
 
                     if ( lowerLine.startsWith( "newsuperior:" ) )
                     {
@@ -1458,7 +1458,7 @@ public class LdifReader implements Itera
             // Each line could start either with an OID, an attribute type, with
             // "control:" or with "changetype:"
             line = iter.next();
-            lowerLine = Strings.toLowerCase( line );
+            lowerLine = Strings.toLowerCaseAscii( line );
 
             // We have three cases :
             // 1) The first line after the Dn is a "control:"