svn commit: r939484 - in /directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name: RDN.java RdnSerializer.java

[se...@apache.org]

Author: seelmann
Date: Thu Apr 29 21:22:01 2010
New Revision: 939484

URL: http://svn.apache.org/viewvc?rev=939484&view=rev
Log:
removed parentId from RDN class


Modified:
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnSerializer.java

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java?rev=939484&r1=939483&r2=939484&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java Thu Apr 29 21:22:01 2010
@@ -184,9 +184,6 @@ public class RDN implements Cloneable, C
     /** Constant used in comparisons */
     public static final int EQUAL = 0;
 
-    /** parent RDN's id */
-    private long parentId = -1;
-
 
     /**
      * A empty constructor.
@@ -1357,9 +1354,6 @@ public class RDN implements Cloneable, C
      */
     public void writeExternal( ObjectOutput out ) throws IOException
     {
-        // write the parent Id first 
-        out.writeLong( parentId );
-
         out.writeInt( nbAtavs );
         out.writeUTF( upName );
 
@@ -1408,9 +1402,6 @@ public class RDN implements Cloneable, C
      */
     public void readExternal( ObjectInput in ) throws IOException, ClassNotFoundException
     {
-        // parent Id
-        parentId = in.readLong();
-
         // Read the ATAV number
         nbAtavs = in.readInt();
 
@@ -1468,24 +1459,4 @@ public class RDN implements Cloneable, C
         return upName == null ? "" : upName;
     }
 
-
-    /**
-     * for INTERNAL use only
-     * @return long gives the parent ID of this RDN
-     */
-    public long _getParentId()
-    {
-        return parentId;
-    }
-
-
-    /**
-     * for INTERNAL use only
-     * @param parentId parent RDN's ID
-     */
-    public void _setParentId( long parentId )
-    {
-        this.parentId = parentId;
-    }
-
 }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnSerializer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnSerializer.java?rev=939484&r1=939483&r2=939484&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnSerializer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnSerializer.java Thu Apr 29 21:22:01 2010
@@ -62,8 +62,6 @@ public class RdnSerializer
      */
     public static void serialize( RDN rdn, ObjectOutput out ) throws IOException
     {
-        out.writeLong( rdn._getParentId() );
-        
         out.writeInt( rdn.getNbAtavs() );
         out.writeUTF( rdn.getName() );
         out.writeUTF( rdn.getNormName() );
@@ -103,8 +101,6 @@ public class RdnSerializer
      */
     public static RDN deserialize( ObjectInput in ) throws IOException
     {
-        long parentId = in.readLong();
-        
         // Read the ATAV number
         int nbAtavs = in.readInt();
         
@@ -125,7 +121,6 @@ public class RdnSerializer
         
         // Now creates the RDN
         RDN rdn = new RDN( length, start, upName, normName );
-        rdn._setParentId( parentId );
 
         // Read through the Atavs
         switch ( nbAtavs )