directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1073757 - in /directory: apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java
Date Wed, 23 Feb 2011 14:54:02 GMT
Author: elecharny
Date: Wed Feb 23 14:54:02 2011
New Revision: 1073757

URL: http://svn.apache.org/viewvc?rev=1073757&view=rev
Log:
o Removed the last Rdn.normalize(Map) method

Modified:
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
    directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java?rev=1073757&r1=1073756&r2=1073757&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
Wed Feb 23 14:54:02 2011
@@ -1178,7 +1178,7 @@ public abstract class AbstractStore<E, I
 
         Dn updn = entry.getDn();
 
-        newRdn.normalize( schemaManager.getNormalizerMapping() );
+        newRdn.normalize( schemaManager );
 
         /*
          * H A N D L E   N E W   R D N

Modified: directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java?rev=1073757&r1=1073756&r2=1073757&view=diff
==============================================================================
--- directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java
(original)
+++ directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java
Wed Feb 23 14:54:02 2011
@@ -28,7 +28,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.commons.collections.MultiMap;
@@ -237,7 +236,7 @@ public final class Rdn implements Clonea
             if ( schemaManager != null )
             {
                 this.schemaManager = schemaManager;
-                normalize( schemaManager.getNormalizerMapping() );
+                normalize( schemaManager );
                 normalized.set( true );
             }
             else
@@ -341,7 +340,7 @@ public final class Rdn implements Clonea
         if( schemaManager != null )
         {
             this.schemaManager = schemaManager;
-            normalize( schemaManager.getNormalizerMapping() );
+            normalize( schemaManager );
             normalized.set( true );
         }
         else
@@ -510,39 +509,6 @@ public final class Rdn implements Clonea
 
 
     /**
-     * Transform a Rdn by changing the value to its OID counterpart and
-     * normalizing the value accordingly to its type.
-     *
-     * @param oidsMap the mapping between names and OIDs
-     * @return this Rdn, normalized
-     * @throws LdapInvalidDnException if the Rdn is invalid
-     */
-    public Rdn normalize( Map<String, OidNormalizer> oidsMap ) throws LdapInvalidDnException
-    {
-        if ( ( oidsMap == null ) || ( oidsMap.isEmpty() ) )
-        {
-            return this;
-        }
-
-        if ( normalized.get() )
-        {
-            return this;
-        }
-
-        synchronized ( this )
-        {
-            String savedUpName = getName();
-            Dn.rdnOidToName(this, oidsMap);
-            normalize();
-            this.upName = savedUpName;
-            normalized.set( true );
-    
-            return this;
-        }
-    }
-
-
-    /**
      * Add a AttributeTypeAndValue to the current Rdn
      *
      * @param upType The user provided type of the added Rdn.



Mime
View raw message