You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ka...@apache.org on 2010/05/03 23:41:04 UTC

svn commit: r940635 - in /directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn: SyncModifyDnControl.java SyncModifyDnControlStatesEnum.java

Author: kayyagari
Date: Mon May  3 21:41:04 2010
New Revision: 940635

URL: http://svn.apache.org/viewvc?rev=940635&view=rev
Log:
o fixed a state's serial number
o renamed a enum constatnt
o fixed an issue where computeLength() is adding 2 extra bytes

Modified:
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnControl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnControlStatesEnum.java

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnControl.java?rev=940635&r1=940634&r2=940635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnControl.java Mon May  3 21:41:04 2010
@@ -117,7 +117,7 @@ public class SyncModifyDnControl extends
                 syncModDnSeqLength += 1 + TLV.getNbBytes( renameLen ) + renameLen;
                 break;
 
-            case MOVEANDREANAME:
+            case MOVEANDRENAME:
                 moveAndRenameLen = 1 + TLV.getNbBytes( newSuperiorDn.length() ) + newSuperiorDn.length();
                 moveAndRenameLen += 1 + TLV.getNbBytes( newRdn.length() ) + newRdn.length();
                 // deleteOldRdn
@@ -127,9 +127,7 @@ public class SyncModifyDnControl extends
                 break;
         }
 
-        valueLength = 1 + TLV.getNbBytes( syncModDnSeqLength ) + syncModDnSeqLength;
-
-        return super.computeLength( valueLength );
+        return super.computeLength( syncModDnSeqLength );
     }
 
 
@@ -172,7 +170,7 @@ public class SyncModifyDnControl extends
                 Value.encode( buffer, deleteOldRdn );
                 break;
 
-            case MOVEANDREANAME:
+            case MOVEANDRENAME:
                 buffer.put( ( byte ) SyncModifyDnControlTags.MOVEANDRENAME_TAG.getValue() );
                 buffer.put( TLV.getBytes( moveAndRenameLen ) );
                 Value.encode( buffer, newSuperiorDn );
@@ -219,7 +217,7 @@ public class SyncModifyDnControl extends
                         Value.encode( buffer, deleteOldRdn );
                         break;
 
-                    case MOVEANDREANAME:
+                    case MOVEANDRENAME:
                         buffer.put( ( byte ) SyncModifyDnControlTags.MOVEANDRENAME_TAG.getValue() );
                         buffer.put( TLV.getBytes( moveAndRenameLen ) );
                         Value.encode( buffer, newSuperiorDn );

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnControlStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnControlStatesEnum.java?rev=940635&r1=940634&r2=940635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnControlStatesEnum.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnControlStatesEnum.java Mon May  3 21:41:04 2010
@@ -73,7 +73,7 @@ public class SyncModifyDnControlStatesEn
     public static final int MOVE_AND_RENAME_DEL_OLD_RDN_STATE = 10;
 
     /** terminal state */
-    public static final int LAST_SYNC_MODDN_VALUE_STATE = 10;
+    public static final int LAST_SYNC_MODDN_VALUE_STATE = 11;
     
     // =========================================================================
     // States debug strings