directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1164212 - in /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core: DefaultDirectoryService.java partition/DefaultPartitionNexus.java
Date Thu, 01 Sep 2011 19:09:32 GMT
Author: elecharny
Date: Thu Sep  1 19:09:31 2011
New Revision: 1164212

URL: http://svn.apache.org/viewvc?rev=1164212&view=rev
Log:
Fix for DIRSERVER-1652

Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=1164212&r1=1164211&r2=1164212&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
Thu Sep  1 19:09:31 2011
@@ -984,7 +984,9 @@ public class DefaultDirectoryService imp
         // load the last stored valid CSN value
         LookupOperationContext loc = new LookupOperationContext( getAdminSession() );
         loc.setDn( systemPartition.getSuffixDn() );
-        loc.setAttrsId( new String[]{ SchemaConstants.CONTEXT_CSN_AT } );
+        
+        // get back all the attributes
+        loc.setAttrsId( new String[]{ SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES, SchemaConstants.ALL_USER_ATTRIBUTES
} );
         Entry entry = systemPartition.lookup( loc );
 
         Attribute cntextCsnAt = entry.get( SchemaConstants.CONTEXT_CSN_AT );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=1164212&r1=1164211&r2=1164212&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
Thu Sep  1 19:09:31 2011
@@ -568,7 +568,7 @@ public class DefaultPartitionNexus exten
             Entry retval = new ClonedServerEntry( rootDSE );
             Set<AttributeType> attributeTypes = rootDSE.getAttributeTypes();
 
-            if ( lookupContext.getAttrsId() != null && !lookupContext.getAttrsId().isEmpty()
)
+            if ( ( lookupContext.getAttrsId() != null ) && !lookupContext.getAttrsId().isEmpty()
)
             {
                 for ( AttributeType attributeType : attributeTypes )
                 {



Mime
View raw message