directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r1083196 - in /directory/apacheds/trunk: core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java
Date Sat, 19 Mar 2011 15:46:25 GMT
Author: kayyagari
Date: Sat Mar 19 15:46:24 2011
New Revision: 1083196

URL: http://svn.apache.org/viewvc?rev=1083196&view=rev
Log:
o fix for setting attribute's user provided Id properly while creating a server modification
o fixed test case (see DIRSERVER-1612)

Modified:
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java?rev=1083196&r1=1083195&r2=1083196&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java
Sat Mar 19 15:46:24 2011
@@ -256,7 +256,7 @@ public class ServerEntryUtils
     {
         Entry targetEntry = ( Entry ) entry.clone();
         ModificationOperation modOp = mod.getOperation();
-        String id = mod.getAttribute().getId();
+        String id = mod.getAttribute().getUpId();
         AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( id );
         
         switch ( modOp )
@@ -454,7 +454,7 @@ public class ServerEntryUtils
     
             for ( Modification modification: modifications )
             {
-                String attributeId = modification.getAttribute().getId();
+                String attributeId = modification.getAttribute().getUpId();
                 String id = stripOptions( attributeId );
                 modification.getAttribute().setUpId( id );
                 Set<String> options = getOptions( attributeId );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java?rev=1083196&r1=1083195&r2=1083196&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java
Sat Mar 19 15:46:24 2011
@@ -289,7 +289,7 @@ public class ModifyReplaceIT extends Abs
         attrs = ctx.getAttributes( rdn );
         Attribute attr = attrs.get( "telephoneNumber" );
         assertNotNull( attr );
-        assertEquals( "telephonenumber", attr.getID() );
+        assertEquals( "telephoneNumber", attr.getID() );
         assertTrue( attr.contains( newValue ) );
         assertEquals( 1, attr.size() );
     }



Mime
View raw message