directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r919009 - in /directory: apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/ apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ apacheds/trunk/core-api/src/main/java/org/apache/di...
Date Thu, 04 Mar 2010 14:57:11 GMT
Author: elecharny
Date: Thu Mar  4 14:57:10 2010
New Revision: 919009

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

Modified:
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/replication/ReplicationProvider.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java
    directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java
    directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockDirectoryService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncreplConfiguration.java
    directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateLdapServer.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java
    directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/SearchRequest.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequestCodec.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchParams.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchRequest.java

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java?rev=919009&r1=919008&r2=919009&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java Thu Mar  4 14:57:10 2010
@@ -699,7 +699,7 @@
      * @throws Exception if there are failures while listing children
      */
     EntryFilteringCursor list( DN dn, AliasDerefMode aliasDerefMode, 
-        Set<AttributeTypeOptions> returningAttributes, int sizeLimit, int timeLimit ) throws Exception;
+        Set<AttributeTypeOptions> returningAttributes, long sizeLimit, int timeLimit ) throws Exception;
     
     
     /**
@@ -765,7 +765,7 @@
      * @throws Exception if there are failures while listing children
      */
     EntryFilteringCursor search( DN dn, SearchScope scope, ExprNode filter, AliasDerefMode aliasDerefMode, 
-        Set<AttributeTypeOptions> returningAttributes, int sizeLimit, int timeLimit ) throws Exception;
+        Set<AttributeTypeOptions> returningAttributes, long sizeLimit, int timeLimit ) throws Exception;
 
 
     EntryFilteringCursor search( InternalSearchRequest searchRequest ) throws Exception;

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java?rev=919009&r1=919008&r2=919009&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java Thu Mar  4 14:57:10 2010
@@ -27,6 +27,7 @@
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
@@ -96,8 +97,21 @@
      */
     public SearchOperationContext( CoreSession session, DN dn, ExprNode filter, SearchControls searchControls ) throws Exception
     {
-        super( session, dn, searchControls );
+        super( session, dn );
         this.filter = filter;
+        scope = SearchScope.getSearchScope( searchControls.getSearchScope() );
+        timeLimit = searchControls.getTimeLimit();
+        sizeLimit = searchControls.getCountLimit();
+        typesOnly = searchControls.getReturningObjFlag();
+
+        if ( searchControls.getReturningAttributes() != null )
+        {
+            setReturningAttributes( searchControls.getReturningAttributes() );
+        }
+        else
+        {
+            setReturningAttributes( SchemaConstants.ALL_USER_ATTRIBUTES_ARRAY );
+        }
     }
 
 

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=919009&r1=919008&r2=919009&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 Thu Mar  4 14:57:10 2010
@@ -107,31 +107,6 @@
 
 
     /**
-     * Creates a new instance of ListOperationContext.
-     *
-     * @param dn The DN to get the suffix from
-     * @param aliasDerefMode the alias dereferencing mode to use
-     * @throws NamingException 
-     */
-    public SearchingOperationContext( CoreSession session, DN dn, SearchControls searchControls ) throws Exception
-    {
-        super( session, dn );
-        this.scope = SearchScope.getSearchScope( searchControls.getSearchScope() );
-        this.timeLimit = searchControls.getTimeLimit();
-        this.sizeLimit = searchControls.getCountLimit();
-
-        if ( searchControls.getReturningAttributes() != null )
-        {
-            setReturningAttributes( searchControls.getReturningAttributes() );
-        }
-        else
-        {
-            setReturningAttributes( SchemaConstants.ALL_USER_ATTRIBUTES_ARRAY );
-        }
-    }
-
-    
-    /**
      * Creates a new instance of a SearchingOperationContext using one level 
      * scope, with attributes to return.
      *

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/replication/ReplicationProvider.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/replication/ReplicationProvider.java?rev=919009&r1=919008&r2=919009&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/replication/ReplicationProvider.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/replication/ReplicationProvider.java Thu Mar  4 14:57:10 2010
@@ -37,7 +37,7 @@
     private ReplicationType type = ReplicationType.REFRESH_AND_PERSIST;
     
     /** The sizeLimit for the searchRequest. Default to unlimited. */
-    private int sizeLimit = 0;
+    private long sizeLimit = 0;
     
     /** The timeLimit for the search request. Default to unlimited. */
     private int timeLimit = 0;
@@ -112,7 +112,7 @@
     /**
      * @return the sizeLimit
      */
-    public int getSizeLimit()
+    public long getSizeLimit()
     {
         return sizeLimit;
     }
@@ -121,7 +121,7 @@
     /**
      * @param sizeLimit the sizeLimit to set
      */
-    public void setSizeLimit( int sizeLimit )
+    public void setSizeLimit( long sizeLimit )
     {
         this.sizeLimit = sizeLimit;
     }

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java?rev=919009&r1=919008&r2=919009&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java Thu Mar  4 14:57:10 2010
@@ -115,17 +115,18 @@
     }
 
 
-    private void recursivelyAddSearchData( Name parent, Attributes[] children, final int sizeLimit, int[] count )
+    private void recursivelyAddSearchData( Name parent, Attributes[] children, final long sizeLimit, long[] count )
         throws Exception
     {
         Name[] childRdns = new Name[children.length];
-        for ( int ii = 0; ii < children.length && count[0] < sizeLimit; ii++ )
+        
+        for ( int i = 0; ( i < children.length ) && ( count[0] < sizeLimit ); i++ )
         {
             Name childRdn = new DN();
             childRdn.addAll( parent );
-            childRdn.add( "ou=" + ii );
-            childRdns[ii] = childRdn;
-            getSystemContext( service ).createSubcontext( childRdn, children[ii] );
+            childRdn.add( "ou=" + i );
+            childRdns[i] = childRdn;
+            getSystemContext( service ).createSubcontext( childRdn, children[i] );
             count[0]++;
         }
 
@@ -134,9 +135,9 @@
             return;
         }
 
-        for ( int ii = 0; ii < children.length && count[0] < sizeLimit; ii++ )
+        for ( int i = 0; ( i < children.length ) && ( count[0] < sizeLimit ); i++ )
         {
-            recursivelyAddSearchData( childRdns[ii], children, sizeLimit, count );
+            recursivelyAddSearchData( childRdns[i], children, sizeLimit, count );
         }
     }
 
@@ -153,12 +154,12 @@
      * @return the immediate child node created under parent which contains the subtree
      * @throws NamingException on error
      */
-    private Name addSearchData( Name parent, int branchingFactor, int sizelimit ) throws Exception
+    private Name addSearchData( Name parent, int branchingFactor, long sizelimit ) throws Exception
     {
         parent = ( Name ) parent.clone();
         parent.add( "ou=tests" );
         getSystemContext( service ).createSubcontext( parent, getTestNodes( 1 )[0] );
-        recursivelyAddSearchData( parent, getTestNodes( branchingFactor ), sizelimit, new int[]
+        recursivelyAddSearchData( parent, getTestNodes( branchingFactor ), sizelimit, new long[]
             { 1 } );
         return parent;
     }

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=919009&r1=919008&r2=919009&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 Thu Mar  4 14:57:10 2010
@@ -52,12 +52,9 @@
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.constants.JndiPropertyConstants;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.exception.LdapSizeLimitExceededException;
-import org.apache.directory.shared.ldap.exception.LdapTimeLimitExceededException;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
  

Modified: directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java?rev=919009&r1=919008&r2=919009&view=diff
==============================================================================
--- directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java (original)
+++ directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java Thu Mar  4 14:57:10 2010
@@ -457,7 +457,7 @@
      * @see org.apache.directory.server.core.CoreSession#list(org.apache.directory.shared.ldap.name.DN, org.apache.directory.shared.ldap.message.AliasDerefMode, java.util.Set, int, int)
      */
     public EntryFilteringCursor list( DN dn, AliasDerefMode aliasDerefMode,
-        Set<AttributeTypeOptions> returningAttributes, int sizeLimit, int timeLimit ) throws Exception
+        Set<AttributeTypeOptions> returningAttributes, long sizeLimit, int timeLimit ) throws Exception
     {
         OperationManager operationManager = directoryService.getOperationManager();
 
@@ -750,7 +750,7 @@
      * @see org.apache.directory.server.core.CoreSession#search(org.apache.directory.shared.ldap.name.DN, org.apache.directory.shared.ldap.filter.SearchScope, org.apache.directory.shared.ldap.filter.ExprNode, org.apache.directory.shared.ldap.message.AliasDerefMode, java.util.Set, int, int)
      */
     public EntryFilteringCursor search( DN dn, SearchScope scope, ExprNode filter, AliasDerefMode aliasDerefMode,
-        Set<AttributeTypeOptions> returningAttributes, int sizeLimit, int timeLimit ) throws Exception
+        Set<AttributeTypeOptions> returningAttributes, long sizeLimit, int timeLimit ) throws Exception
     {
         OperationManager operationManager = directoryService.getOperationManager();
         
@@ -916,6 +916,7 @@
         OperationManager operationManager = directoryService.getOperationManager();
         EntryFilteringCursor cursor = operationManager.search( opContext );
         searchRequest.getResultResponse().addAll( opContext.getResponseControls() );
+        
         return cursor;
     }
 

Modified: directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockDirectoryService.java?rev=919009&r1=919008&r2=919009&view=diff
==============================================================================
--- directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockDirectoryService.java (original)
+++ directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockDirectoryService.java Thu Mar  4 14:57:10 2010
@@ -275,13 +275,13 @@
     }
 
 
-    public void setMaxSizeLimit( int maxSizeLimit )
+    public void setMaxSizeLimit( long maxSizeLimit )
     {
 
     }
 
 
-    public int getMaxSizeLimit()
+    public long getMaxSizeLimit()
     {
         return 0;
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java?rev=919009&r1=919008&r2=919009&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java Thu Mar  4 14:57:10 2010
@@ -457,7 +457,7 @@
      * @see org.apache.directory.server.core.CoreSession#list(org.apache.directory.shared.ldap.name.DN, org.apache.directory.shared.ldap.message.AliasDerefMode, java.util.Set, int, int)
      */
     public EntryFilteringCursor list( DN dn, AliasDerefMode aliasDerefMode,
-        Set<AttributeTypeOptions> returningAttributes, int sizeLimit, int timeLimit ) throws Exception
+        Set<AttributeTypeOptions> returningAttributes, long sizeLimit, int timeLimit ) throws Exception
     {
         OperationManager operationManager = directoryService.getOperationManager();
 
@@ -751,7 +751,7 @@
      * @see org.apache.directory.server.core.CoreSession#search(org.apache.directory.shared.ldap.name.DN, org.apache.directory.shared.ldap.filter.SearchScope, org.apache.directory.shared.ldap.filter.ExprNode, org.apache.directory.shared.ldap.message.AliasDerefMode, java.util.Set, int, int)
      */
     public EntryFilteringCursor search( DN dn, SearchScope scope, ExprNode filter, AliasDerefMode aliasDerefMode,
-        Set<AttributeTypeOptions> returningAttributes, int sizeLimit, int timeLimit ) throws Exception
+        Set<AttributeTypeOptions> returningAttributes, long sizeLimit, int timeLimit ) throws Exception
     {
         OperationManager operationManager = directoryService.getOperationManager();
 
@@ -918,6 +918,7 @@
         OperationManager operationManager = directoryService.getOperationManager();
         EntryFilteringCursor cursor = operationManager.search( opContext );
         searchRequest.getResultResponse().addAll( opContext.getResponseControls() );
+        
         return cursor;
     }
 

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java?rev=919009&r1=919008&r2=919009&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java Thu Mar  4 14:57:10 2010
@@ -702,13 +702,13 @@
         }
 
 
-        public void setMaxSizeLimit( int maxSizeLimit )
+        public void setMaxSizeLimit( long maxSizeLimit )
         {
 
         }
 
 
-        public int getMaxSizeLimit()
+        public long getMaxSizeLimit()
         {
             return 0;
         }

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java?rev=919009&r1=919008&r2=919009&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java Thu Mar  4 14:57:10 2010
@@ -511,12 +511,12 @@
         }
 
 
-        public void setMaxSizeLimit( int maxSizeLimit )
+        public void setMaxSizeLimit( long maxSizeLimit )
         {
         }
 
 
-        public int getMaxSizeLimit()
+        public long getMaxSizeLimit()
         {
             return 0;
         }

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java?rev=919009&r1=919008&r2=919009&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java Thu Mar  4 14:57:10 2010
@@ -116,7 +116,7 @@
     private static final Logger LOG = LoggerFactory.getLogger( LdapServer.class.getName() );
 
     /** Value (0) for configuration where size limit is unlimited. */
-    public static final int NO_SIZE_LIMIT = 0;
+    public static final long NO_SIZE_LIMIT = 0;
 
     /** Value (0) for configuration where time limit is unlimited. */
     public static final int NO_TIME_LIMIT = 0;
@@ -125,7 +125,7 @@
     public static final String SERVICE_NAME = "ldap";
     
     /** The default maximum size limit. */
-    private static final int MAX_SIZE_LIMIT_DEFAULT = 100;
+    private static final long MAX_SIZE_LIMIT_DEFAULT = 100;
 
     /** The default maximum time limit. */
     private static final int MAX_TIME_LIMIT_DEFAULT = 10000;
@@ -149,7 +149,7 @@
      * The maximum size limit. 
      * @see {@link LdapServer#MAX_SIZE_LIMIT_DEFAULT }
      */
-    private int maxSizeLimit = MAX_SIZE_LIMIT_DEFAULT; 
+    private long maxSizeLimit = MAX_SIZE_LIMIT_DEFAULT; 
 
     /** 
      * The maximum time limit.
@@ -749,7 +749,7 @@
      *
      * @param maxSizeLimit the maximum number of entries to return for search
      */
-    public void setMaxSizeLimit( int maxSizeLimit )
+    public void setMaxSizeLimit( long maxSizeLimit )
     {
         this.maxSizeLimit = maxSizeLimit;
     }
@@ -760,7 +760,7 @@
      *
      * @return The maximum size limit.
      */
-    public int getMaxSizeLimit()
+    public long getMaxSizeLimit()
     {
         return maxSizeLimit;
     }

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java?rev=919009&r1=919008&r2=919009&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java Thu Mar  4 14:57:10 2010
@@ -456,7 +456,7 @@
      * @param contextId The context ID to remove
      * @return The removed context if any found
      */
-    public PagedSearchContext removePagedSearchContext( int contextId )
+    public PagedSearchContext removePagedSearchContext( long contextId )
     {
         synchronized ( pagedSearchContexts )
         {

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java?rev=919009&r1=919008&r2=919009&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java Thu Mar  4 14:57:10 2010
@@ -281,13 +281,13 @@
     /**
      * Return the server size limit
      */
-    private int getServerSizeLimit( LdapSession session, InternalSearchRequest request )
+    private long getServerSizeLimit( LdapSession session, InternalSearchRequest request )
     {
         if ( session.getCoreSession().isAnAdministrator() )
         {
             if ( request.getSizeLimit() == NO_SIZE_LIMIT )
             {
-                return Integer.MAX_VALUE;
+                return Long.MAX_VALUE;
             }
             else
             {
@@ -298,7 +298,7 @@
         {
             if ( ldapServer.getMaxSizeLimit() == NO_SIZE_LIMIT )
             {
-                return Integer.MAX_VALUE;
+                return Long.MAX_VALUE;
             }
             else
             {
@@ -309,9 +309,9 @@
     
     
     private void readResults( LdapSession session, InternalSearchRequest req, InternalLdapResult ldapResult,
-    EntryFilteringCursor cursor, int sizeLimit ) throws Exception
+    EntryFilteringCursor cursor, long sizeLimit ) throws Exception
     {
-        int count = 0;
+        long count = 0;
 
         while ( (count < sizeLimit ) && cursor.next() )
         {
@@ -354,13 +354,13 @@
     
     
     private void readPagedResults( LdapSession session, InternalSearchRequest req, InternalLdapResult ldapResult,  
-        EntryFilteringCursor cursor, int sizeLimit, int pagedLimit, boolean isPaged, 
+        EntryFilteringCursor cursor, long sizeLimit, int pagedLimit, boolean isPaged, 
         PagedSearchContext pagedContext, PagedResultsControl pagedResultsControl ) throws Exception
     {
         req.addAbandonListener( new SearchAbandonListener( ldapServer, cursor ) );
         setTimeLimitsOnCursor( req, session, cursor );
         LOG.debug( "using <{},{}> for size limit", sizeLimit, pagedLimit );
-        int cookieValue = 0;
+        long cookieValue = 0;
         
         int count = pagedContext.getCurrentPosition();
         int pageCount = 0;
@@ -504,7 +504,7 @@
             return null;
         }
         
-        int cookieValue = cookieInstance.getCookieValue();
+        long cookieValue = cookieInstance.getCookieValue();
         
         return session.removePagedSearchContext( cookieValue );
     }
@@ -521,11 +521,11 @@
 
         // Get the size limits
         // Don't bother setting size limits for administrators that don't ask for it
-        int serverLimit = getServerSizeLimit( session, req );
+        long serverLimit = getServerSizeLimit( session, req );
         
-        int requestLimit = req.getSizeLimit() == 0 ?
-            Integer.MAX_VALUE : req.getSizeLimit();
-        int sizeLimit = min( serverLimit, requestLimit );
+        long requestLimit = req.getSizeLimit() == 0L ?
+            Long.MAX_VALUE : req.getSizeLimit();
+        long sizeLimit = min( serverLimit, requestLimit );
 
         int pagedLimit = pagedSearchControl.getSize();
         EntryFilteringCursor cursor = null;
@@ -546,7 +546,7 @@
         // was a simple search
         
         // Case 1
-        if ( pagedLimit == 0 )
+        if ( pagedLimit == 0L )
         {
             // An abandoned paged search
             return abandonPagedSearch( session, req );
@@ -738,15 +738,15 @@
         {
             // Get the size limits
             // Don't bother setting size limits for administrators that don't ask for it
-            int serverLimit = getServerSizeLimit( session, req );
+            long serverLimit = getServerSizeLimit( session, req );
             
-            int requestLimit = req.getSizeLimit() == 0 ?
-                Integer.MAX_VALUE : req.getSizeLimit();
+            long requestLimit = req.getSizeLimit() == 0L ?
+                Long.MAX_VALUE : req.getSizeLimit();
 
             req.addAbandonListener( new SearchAbandonListener( ldapServer, cursor ) );
             setTimeLimitsOnCursor( req, session, cursor );
             LOG.debug( "using <{},{}> for size limit", requestLimit, serverLimit );
-            int sizeLimit = min( requestLimit, serverLimit );
+            long sizeLimit = min( requestLimit, serverLimit );
             
             readResults( session, req, ldapResult, cursor, sizeLimit );
         }

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncreplConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncreplConfiguration.java?rev=919009&r1=919008&r2=919009&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncreplConfiguration.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncreplConfiguration.java Thu Mar  4 14:57:10 2010
@@ -57,9 +57,9 @@
     /** a comma separated string of attribute names */
     private String attributes;
 
-    /** the numer for setting the limit on numer of search results to be fteched
+    /** the number for setting the limit on number of search results to be fetched
      * default value is 0 (i.e no limit) */
-    private int searchSizeLimit = 0;
+    private long searchSizeLimit = 0L;
 
     /** the timeout value to be used while doing a search 
      * default value is 0 (i.e no limit)*/
@@ -218,7 +218,7 @@
     /**
      * @return the searchSizeLimit
      */
-    public int getSearchSizeLimit()
+    public long getSearchSizeLimit()
     {
         return searchSizeLimit;
     }
@@ -226,7 +226,7 @@
     /**
      * @param searchSizeLimit the searchSizeLimit to set
      */
-    public void setSearchSizeLimit( int searchSizeLimit )
+    public void setSearchSizeLimit( long searchSizeLimit )
     {
         this.searchSizeLimit = searchSizeLimit;
     }

Modified: directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateLdapServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateLdapServer.java?rev=919009&r1=919008&r2=919009&view=diff
==============================================================================
--- directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateLdapServer.java (original)
+++ directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateLdapServer.java Thu Mar  4 14:57:10 2010
@@ -58,7 +58,7 @@
     Class<?> factory() default DefaultLdapServerFactory.class;
     
     /** The maximum size limit.*/
-    int maxSizeLimit() default 1000;
+    long maxSizeLimit() default 1000;
     
     /** The maximum time limit. */
     int maxTimeLimit() default 1000;

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java?rev=919009&r1=919008&r2=919009&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java Thu Mar  4 14:57:10 2010
@@ -270,6 +270,7 @@
             }
             catch ( Exception e )
             {
+                e.printStackTrace();
                 hasSizeLimitException = true;
                 break;
             }
@@ -322,7 +323,7 @@
     public void testPagedSearchtest1() throws Exception
     {
         DirContext ctx = getWiredContext( ldapServer );
-        SearchControls controls = createSearchControls( ctx, LdapServer.NO_SIZE_LIMIT, 3 );
+        SearchControls controls = createSearchControls( ctx, (int)LdapServer.NO_SIZE_LIMIT, 3 );
         
         doLoop( ctx, controls, 3, 4, 10, false );
     }
@@ -340,7 +341,7 @@
     public void testPagedSearchtest2() throws Exception
     {
         DirContext ctx = getWiredContext( ldapServer );
-        SearchControls controls = createSearchControls( ctx, LdapServer.NO_SIZE_LIMIT, 5 );
+        SearchControls controls = createSearchControls( ctx, (int)LdapServer.NO_SIZE_LIMIT, 5 );
         
         doLoop( ctx, controls, 5, 2, 10, false );
     }
@@ -359,7 +360,7 @@
     {
         ldapServer.setMaxSizeLimit( 3 );
         DirContext ctx = getWiredContext( ldapServer );
-        SearchControls controls = createSearchControls( ctx, LdapServer.NO_SIZE_LIMIT, 5 );
+        SearchControls controls = createSearchControls( ctx, (int)LdapServer.NO_SIZE_LIMIT, 5 );
         
         doLoop( ctx, controls, 5, 2, 10, false );
     }
@@ -396,7 +397,7 @@
     {
         ldapServer.setMaxSizeLimit( 5 );
         DirContext ctx = getWiredContext( ldapServer );
-        SearchControls controls = createSearchControls( ctx, LdapServer.NO_SIZE_LIMIT, 3 );
+        SearchControls controls = createSearchControls( ctx, (int)LdapServer.NO_SIZE_LIMIT, 3 );
 
         doLoop( ctx, controls, 3, 4, 10, false );
     }
@@ -433,7 +434,7 @@
     {
         ldapServer.setMaxSizeLimit( 5 );
         DirContext ctx = getWiredContext( ldapServer );
-        SearchControls controls = createSearchControls( ctx, LdapServer.NO_SIZE_LIMIT, 5 );
+        SearchControls controls = createSearchControls( ctx, (int)LdapServer.NO_SIZE_LIMIT, 5 );
         
         doLoop( ctx, controls, 5, 2, 10, false );
     }
@@ -640,7 +641,7 @@
     public void testPagedSearchtest18() throws Exception
     {
         DirContext ctx = getWiredContext( ldapServer, "cn=user,ou=system", "secret" );
-        SearchControls controls = createSearchControls( ctx, LdapServer.NO_SIZE_LIMIT, 3 );
+        SearchControls controls = createSearchControls( ctx, (int)LdapServer.NO_SIZE_LIMIT, 3 );
         
         doLoop( ctx, controls, 3, 4, 10, false );
     }
@@ -658,7 +659,7 @@
     public void testPagedSearchtest19() throws Exception
     {
         DirContext ctx = getWiredContext( ldapServer, "cn=user,ou=system", "secret" );
-        SearchControls controls = createSearchControls( ctx, LdapServer.NO_SIZE_LIMIT, 5 );
+        SearchControls controls = createSearchControls( ctx, (int)LdapServer.NO_SIZE_LIMIT, 5 );
         
         doLoop( ctx, controls, 5, 2, 10, false );
     }
@@ -677,7 +678,7 @@
     {
         ldapServer.setMaxSizeLimit( 3 );
         DirContext ctx = getWiredContext( ldapServer, "cn=user,ou=system", "secret" );
-        SearchControls controls = createSearchControls( ctx, LdapServer.NO_SIZE_LIMIT, 5 );
+        SearchControls controls = createSearchControls( ctx, (int)LdapServer.NO_SIZE_LIMIT, 5 );
         
         doLoop( ctx, controls, 5, 1, 3, true );
     }
@@ -714,7 +715,7 @@
     {
         ldapServer.setMaxSizeLimit( 5 );
         DirContext ctx = getWiredContext( ldapServer, "cn=user,ou=system", "secret" );
-        SearchControls controls = createSearchControls( ctx, LdapServer.NO_SIZE_LIMIT, 3 );
+        SearchControls controls = createSearchControls( ctx, (int)LdapServer.NO_SIZE_LIMIT, 3 );
         
         doLoop( ctx, controls, 3, 2, 5, true );
     }
@@ -752,7 +753,7 @@
     {
         ldapServer.setMaxSizeLimit( 5 );
         DirContext ctx = getWiredContext( ldapServer, "cn=user,ou=system", "secret" );
-        SearchControls controls = createSearchControls( ctx, LdapServer.NO_SIZE_LIMIT, 5 );
+        SearchControls controls = createSearchControls( ctx, (int)LdapServer.NO_SIZE_LIMIT, 5 );
         
         doLoop( ctx, controls, 5, 1, 5, true );
     }
@@ -960,7 +961,7 @@
     public void testPagedSearchWithNegativePL() throws Exception
     {
         DirContext ctx = getWiredContext( ldapServer, "cn=user,ou=system", "secret" );
-        SearchControls controls = createSearchControls( ctx, LdapServer.NO_SIZE_LIMIT, -2 );
+        SearchControls controls = createSearchControls( ctx, (int)LdapServer.NO_SIZE_LIMIT, -2 );
         
         doLoop( ctx, controls, -2, 1, 10, false );
     }
@@ -973,7 +974,7 @@
     public void testPagedSearchWrongCookie() throws Exception
     {
         DirContext ctx = getWiredContext( ldapServer, "cn=user,ou=system", "secret" );
-        SearchControls controls = createSearchControls( ctx, LdapServer.NO_SIZE_LIMIT, 3 );
+        SearchControls controls = createSearchControls( ctx, (int)LdapServer.NO_SIZE_LIMIT, 3 );
 
         // Loop over all the elements
         int loop = 0;
@@ -1034,7 +1035,7 @@
     public void testPagedSearchModifyingPagedLimit() throws Exception
     {
         DirContext ctx = getWiredContext( ldapServer, "cn=user,ou=system", "secret" );
-        SearchControls controls = createSearchControls( ctx, LdapServer.NO_SIZE_LIMIT, 4 );
+        SearchControls controls = createSearchControls( ctx, (int)LdapServer.NO_SIZE_LIMIT, 4 );
 
         // Loop over all the elements
         int loop = 0;

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java?rev=919009&r1=919008&r2=919009&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java Thu Mar  4 14:57:10 2010
@@ -1692,7 +1692,7 @@
     @Test
     public void testSearchSizeLimit() throws Exception
     {
-        int sizeLimit = 7;
+        long sizeLimit = 7;
         LdapConnection connection = getClientApiConnection( ldapServer );
         SearchRequest req = new SearchRequest();
         req.setBaseDn( "ou=system" );
@@ -1701,7 +1701,8 @@
         req.setSizeLimit( sizeLimit );
 
         Cursor<SearchResponse> cursor = connection.search( req );
-        int i = 0;
+        long i = 0;
+        
         while ( cursor.next() )
         {
             ++i;

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java?rev=919009&r1=919008&r2=919009&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java Thu Mar  4 14:57:10 2010
@@ -166,7 +166,7 @@
 
     
     private int oldMaxTimeLimit;
-    private int oldMaxSizeLimit;
+    private long oldMaxSizeLimit;
     private DelayInducingInterceptor delayInterceptor;
 
     
@@ -443,7 +443,7 @@
      * Do a search request from the ou=actors,ou=system base, with a principal
      * which is the administrator.
      */
-    private Set<String> getActorsWithLimit( String filter, int timeLimitMillis, int sizeLimit ) throws Exception
+    private Set<String> getActorsWithLimit( String filter, int timeLimitMillis, long sizeLimit ) throws Exception
     {
         DirContext ctx = getWiredContext( ldapServer );
         Set<String> results = new HashSet<String>();
@@ -467,7 +467,7 @@
      * Do a search request from the ou=actors,ou=system base, with a principal
      * which is not the administrator.
      */
-    private Set<String> getActorsWithLimitNonAdmin( String filter, int timeLimitMillis, int sizeLimit ) 
+    private Set<String> getActorsWithLimitNonAdmin( String filter, int timeLimitMillis, long sizeLimit ) 
         throws Exception
     {
         DirContext ctx = getWiredContext( ldapServer, "uid=jblack,ou=actors,ou=system", "secret" );

Modified: directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/SearchRequest.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/SearchRequest.java?rev=919009&r1=919008&r2=919009&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/SearchRequest.java (original)
+++ directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/SearchRequest.java Thu Mar  4 14:57:10 2010
@@ -48,7 +48,7 @@
     private boolean typesOnly;
 
     /** Max size in entries to return */
-    private int sizeLimit;
+    private long sizeLimit;
 
     /** Max seconds to wait for search to complete */
     private int timeLimit;
@@ -200,7 +200,7 @@
      * 
      * @return search size limit.
      */
-    public int getSizeLimit()
+    public long getSizeLimit()
     {
         return sizeLimit;
     }
@@ -214,7 +214,7 @@
      * 
      * @param entriesMax maximum search result entries to return.
      */
-    public void setSizeLimit( int entriesMax )
+    public void setSizeLimit( long entriesMax )
     {
         sizeLimit = entriesMax;
     }

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java?rev=919009&r1=919008&r2=919009&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java Thu Mar  4 14:57:10 2010
@@ -1938,7 +1938,7 @@
             {
                 try
                 {
-                    searchRequest.setSizeLimit( Integer.parseInt( attributeValue ) );
+                    searchRequest.setSizeLimit( Long.parseLong( attributeValue ) );
                 }
                 catch ( NumberFormatException e )
                 {
@@ -1947,7 +1947,7 @@
             }
             else
             {
-                searchRequest.setSizeLimit( 0 );
+                searchRequest.setSizeLimit( 0L );
             }
             // timeLimit
             attributeValue = xpp.getAttributeValue( "", "timeLimit" );

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java?rev=919009&r1=919008&r2=919009&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java Thu Mar  4 14:57:10 2010
@@ -133,7 +133,7 @@
         }
 
         // SizeLimit
-        if ( request.getSizeLimit() != 0 )
+        if ( request.getSizeLimit() != 0L )
         {
             element.addAttribute( "sizeLimit", "" + request.getSizeLimit() );
         }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java?rev=919009&r1=919008&r2=919009&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java Thu Mar  4 14:57:10 2010
@@ -38,6 +38,8 @@
 import org.apache.directory.shared.asn1.util.BooleanDecoderException;
 import org.apache.directory.shared.asn1.util.IntegerDecoder;
 import org.apache.directory.shared.asn1.util.IntegerDecoderException;
+import org.apache.directory.shared.asn1.util.LongDecoder;
+import org.apache.directory.shared.asn1.util.LongDecoderException;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.abandon.AbandonRequestCodec;
 import org.apache.directory.shared.ldap.codec.actions.AttributeDescAction;
@@ -3835,13 +3837,13 @@
                     // The current TLV should be a integer
                     // We get it and store it in sizeLimit
                     Value value = tlv.getValue();
-                    int sizeLimit = 0;
+                    long sizeLimit = 0;
 
                     try
                     {
-                        sizeLimit = IntegerDecoder.parse( value, 0, Integer.MAX_VALUE );
+                        sizeLimit = LongDecoder.parse( value, 0, Integer.MAX_VALUE );
                     }
-                    catch ( IntegerDecoderException ide )
+                    catch ( LongDecoderException lde )
                     {
                         log.error( I18n.err( I18n.ERR_04103, value.toString() ) );
                         throw new DecoderException( I18n.err( I18n.ERR_04103, value.toString() ) );
@@ -3851,7 +3853,7 @@
 
                     if ( IS_DEBUG )
                     {
-                        log.debug( "The sizeLimit value is set to {} objects", Integer.valueOf( sizeLimit ) );
+                        log.debug( "The sizeLimit value is set to {} objects", Long.valueOf( sizeLimit ) );
                     }
 
                     return;

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequestCodec.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequestCodec.java?rev=919009&r1=919008&r2=919009&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequestCodec.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequestCodec.java Thu Mar  4 14:57:10 2010
@@ -69,7 +69,7 @@
     private int derefAliases;
 
     /** The size limit (number of objects returned) */
-    private int sizeLimit;
+    private long sizeLimit;
 
     /**
      * The time limit (max time to process the response before returning the
@@ -254,7 +254,7 @@
      * 
      * @return Returns the sizeLimit.
      */
-    public int getSizeLimit()
+    public long getSizeLimit()
     {
         return sizeLimit;
     }
@@ -265,7 +265,7 @@
      * 
      * @param sizeLimit The sizeLimit to set.
      */
-    public void setSizeLimit( int sizeLimit )
+    public void setSizeLimit( long sizeLimit )
     {
         this.sizeLimit = sizeLimit;
     }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchParams.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchParams.java?rev=919009&r1=919008&r2=919009&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchParams.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchParams.java Thu Mar  4 14:57:10 2010
@@ -50,7 +50,7 @@
     private SearchScope scope = SearchScope.OBJECT;
     
     /** The time limit. Default to 0 (infinite) */
-    private long timeLimit = 0;
+    private int timeLimit = 0;
     
     /** The size limit. Default to 0 (infinite) */
     private long sizeLimit = 0;
@@ -103,7 +103,7 @@
     /**
      * @return the timeLimit
      */
-    public long getTimeLimit()
+    public int getTimeLimit()
     {
         return timeLimit;
     }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java?rev=919009&r1=919008&r2=919009&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java Thu Mar  4 14:57:10 2010
@@ -59,7 +59,7 @@
     private boolean typesOnly;
 
     /** Max size in entries to return */
-    private int sizeLimit;
+    private long sizeLimit;
 
     /** Max seconds to wait for search to complete */
     private int timeLimit;
@@ -236,7 +236,7 @@
      * 
      * @return search size limit.
      */
-    public int getSizeLimit()
+    public long getSizeLimit()
     {
         return sizeLimit;
     }
@@ -251,7 +251,7 @@
      * @param entriesMax
      *            maximum search result entries to return.
      */
-    public void setSizeLimit( int entriesMax )
+    public void setSizeLimit( long entriesMax )
     {
         sizeLimit = entriesMax;
     }
@@ -494,7 +494,7 @@
 
         sb.append( "        Size Limit : " );
 
-        if ( sizeLimit == 0 )
+        if ( sizeLimit == 0L )
         {
             sb.append( "no limit" );
         }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchRequest.java?rev=919009&r1=919008&r2=919009&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchRequest.java Thu Mar  4 14:57:10 2010
@@ -122,7 +122,7 @@
      * 
      * @return search size limit.
      */
-    int getSizeLimit();
+    long getSizeLimit();
 
 
     /**
@@ -134,7 +134,7 @@
      * @param entriesMax
      *            maximum search result entries to return.
      */
-    void setSizeLimit( int entriesMax );
+    void setSizeLimit( long entriesMax );
 
 
     /**



Mime
View raw message