directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r917994 - in /directory/apacheds/trunk: core-api/src/main/java/org/apache/directory/server/core/filtering/ core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ core-integ/src/test/java/org/apache/directory/server/cor...
Date Tue, 02 Mar 2010 12:23:11 GMT
Author: kayyagari
Date: Tue Mar  2 12:23:11 2010
New Revision: 917994

URL: http://svn.apache.org/viewvc?rev=917994&view=rev
Log:
fix for DIRSERVER-1473

Modified:
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/BaseEntryFilteringCursor.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/BaseEntryFilteringCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/BaseEntryFilteringCursor.java?rev=917994&r1=917993&r2=917994&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/BaseEntryFilteringCursor.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/BaseEntryFilteringCursor.java
Tue Mar  2 12:23:11 2010
@@ -373,8 +373,8 @@
     {
         boolean typesOnly = getOperationContext().isTypesOnly();
 
-        boolean returnAll = getOperationContext().getReturningAttributes() == null ||
-            ( getOperationContext().isAllOperationalAttributes() && getOperationContext().isAllUserAttributes()
&& ( ! typesOnly ) );
+        boolean returnAll = ( getOperationContext().getReturningAttributes() == null ||
+            ( getOperationContext().isAllOperationalAttributes() && getOperationContext().isAllUserAttributes()
) ) && ( ! typesOnly );
         
         if ( returnAll )
         {

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java?rev=917994&r1=917993&r2=917994&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java
Tue Mar  2 12:23:11 2010
@@ -200,6 +200,10 @@
         {
             setReturningAttributes( searchControls.getReturningAttributes() );
         }
+        else
+        {
+            setReturningAttributes( SchemaConstants.ALL_USER_ATTRIBUTES_ARRAY );
+        }
     }
 
     

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java?rev=917994&r1=917993&r2=917994&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java
(original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java
Tue Mar  2 12:23:11 2010
@@ -1731,8 +1731,8 @@
        assertNotNull( attrs.get( SchemaConstants.OU_AT ) );
        assertNotNull( attrs.get( "integerAttribute" ) );
 
-       assertNotNull( attrs.get( SchemaConstants.OU_AT ).get() );
-       assertNotNull( attrs.get( "integerAttribute" ).get() );
+       assertEquals( 0, attrs.get( SchemaConstants.OU_AT ).size() );
+       assertEquals( 0, attrs.get( "integerAttribute" ).size() );
        
        assertNull( attrs.get( SchemaConstants.ENTRY_UUID_AT ) );
        assertNull( attrs.get( SchemaConstants.CREATORS_NAME_AT ) );



Mime
View raw message