svn commit: r1419477 - /directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/entry/ServerEntryUtils.java

[el...@apache.org]

Author: elecharny
Date: Mon Dec 10 14:09:53 2012
New Revision: 1419477

URL: http://svn.apache.org/viewvc?rev=1419477&view=rev
Log:
Another forgotten file in the last commit :/

Modified:
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/entry/ServerEntryUtils.java

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/entry/ServerEntryUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/entry/ServerEntryUtils.java?rev=1419477&r1=1419476&r2=1419477&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/entry/ServerEntryUtils.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/entry/ServerEntryUtils.java Mon Dec 10 14:09:53 2012
@@ -35,7 +35,7 @@ import javax.naming.directory.InvalidAtt
 import javax.naming.directory.ModificationItem;
 import javax.naming.directory.SearchResult;
 
-import org.apache.directory.server.core.api.interceptor.context.SearchingOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.FilteringOperationContext;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.entry.Attribute;
@@ -736,14 +736,14 @@ public class ServerEntryUtils
      * 
      * @param entry The entry to filter
      * @param operationContext The SearchingOperationContext
-     * @throws Exception If the filtering fails
+     * @throws LdapException If the filtering fails
      */
-    public static void filterContents( Entry entry, SearchingOperationContext operationContext ) throws Exception
+    public static void filterContents( Entry entry, FilteringOperationContext operationContext ) throws LdapException
     {
         boolean typesOnly = operationContext.isTypesOnly();
 
         boolean returnAll = ( operationContext.getReturningAttributes() == null ||
-            ( operationContext.isAllOperationalAttributes() && operationContext.isAllUserAttributes() ) )
+            ( operationContext.hasAllOperationalAttributes() && operationContext.hasAllUserAttributes() ) )
             && ( !typesOnly );
 
         if ( returnAll )
@@ -764,7 +764,7 @@ public class ServerEntryUtils
             return;
         }
 
-        if ( operationContext.isAllUserAttributes() )
+        if ( operationContext.hasAllUserAttributes() )
         {
             for ( Attribute attribute : originalEntry.getAttributes() )
             {
@@ -796,7 +796,7 @@ public class ServerEntryUtils
             return;
         }
 
-        if ( operationContext.isAllOperationalAttributes() )
+        if ( operationContext.hasAllOperationalAttributes() )
         {
             for ( Attribute attribute : originalEntry.getAttributes() )
             {