directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gokt...@apache.org
Subject svn commit: r1371871 - /directory/apacheds/branches/apacheds-txns/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
Date Sat, 11 Aug 2012 05:40:39 GMT
Author: gokturk
Date: Sat Aug 11 05:40:39 2012
New Revision: 1371871

URL: http://svn.apache.org/viewvc?rev=1371871&view=rev
Log:
 *lookup method is fixed for this scenario:(Merged from trunk)
    LookupContext has attributeIds containing ALL_OPERATIONAL and couple of user attributes.
Before then, code was discarding the all user attributes completely on this scenario.
    *Formatted the code with Directory formatter

Modified:
    directory/apacheds/branches/apacheds-txns/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java

Modified: directory/apacheds/branches/apacheds-txns/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java?rev=1371871&r1=1371870&r2=1371871&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
(original)
+++ directory/apacheds/branches/apacheds-txns/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
Sat Aug 11 05:40:39 2012
@@ -925,10 +925,14 @@ public abstract class AbstractBTreeParti
                 for ( Attribute attribute : ( ( ( ClonedServerEntry ) entry ).getOriginalEntry()
).getAttributes() )
                 {
                     AttributeType attributeType = attribute.getAttributeType();
+                    String oid = attributeType.getOid();
 
                     if ( attributeType.getUsage() == UsageEnum.USER_APPLICATIONS )
                     {
-                        entry.removeAttributes( attributeType );
+                        if ( !lookupContext.getAttrsId().contains( oid ) )
+                        {
+                            entry.removeAttributes( attributeType );
+                        }
                     }
                 }
             }



Mime
View raw message