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 2016/05/17 08:52:03 UTC
svn commit: r1744216 - in /directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model: ldif/LdifReader.java name/Dn.java name/FastDnParser.java

Author: elecharny
Date: Tue May 17 08:52:03 2016
New Revision: 1744216

URL: http://svn.apache.org/viewvc?rev=1744216&view=rev
Log:
o Storing the SM in the DN when constructing it from a list of RDN
o Passing the SM to the RDN when adding a new AVA

Modified:
    directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifReader.java
    directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Dn.java
    directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/FastDnParser.java

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifReader.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifReader.java?rev=1744216&r1=1744215&r2=1744216&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifReader.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifReader.java Tue May 17 08:52:03 2016
@@ -291,7 +291,7 @@ public class LdifReader implements Itera
      */
     public void init() throws LdapException
     {
-        lines = new ArrayList<String>();
+        lines = new ArrayList<>();
         position = 0;
         version = DEFAULT_VERSION;
         containsChanges = false;

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Dn.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Dn.java?rev=1744216&r1=1744215&r2=1744216&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Dn.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Dn.java Tue May 17 08:52:03 2016
@@ -370,6 +370,8 @@ public class Dn implements Iterable<Rdn>
      */
     public Dn( SchemaManager schemaManager, Rdn... rdns ) throws LdapInvalidDnException
     {
+        this.schemaManager = schemaManager;
+        
         if ( rdns == null )
         {
             return;

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/FastDnParser.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/FastDnParser.java?rev=1744216&r1=1744215&r2=1744216&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/FastDnParser.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/FastDnParser.java Tue May 17 08:52:03 2016
@@ -189,7 +189,7 @@ import org.apache.directory.api.util.Pos
         String upName = name.substring( rdnStart, pos.start );
 
         Ava ava = new Ava( schemaManager, type, upValue );
-        rdn.addAVA( null, ava );
+        rdn.addAVA( schemaManager, ava );
 
         rdn.setUpName( upName );
         rdn.hashCode();