Repository: archiva Updated Branches: refs/heads/master 588f40d0d -> 0c07ad8d5
make no limit working back Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/30d380e6 Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/30d380e6 Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/30d380e6 Branch: refs/heads/master Commit: 30d380e6b03aa1016c4ec0ba2df79336cc5e7c81 Parents: 641e049 Author: Olivier Lamy <[email protected]> Authored: Thu Apr 24 11:52:05 2014 +1000 Committer: Olivier Lamy <[email protected]> Committed: Thu Apr 24 11:52:24 2014 +1000 ---------------------------------------------------------------------- .../org/apache/archiva/indexer/search/MavenRepositorySearch.java | 3 ++- .../apache/archiva/indexer/search/MavenRepositorySearchTest.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/30d380e6/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java index c126fd7..2a41526 100644 --- a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java +++ b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java @@ -274,7 +274,8 @@ public class MavenRepositorySearch request.setContexts( getIndexingContexts( indexingContextIds ) ); if ( limits != null ) { - if ( limits.getSelectedPage() < 1 ) + // we apply limits only when first page asked + if ( limits.getSelectedPage() == 0 ) { request.setCount( limits.getPageSize() * ( Math.max( 1, limits.getSelectedPage() ) ) ); } http://git-wip-us.apache.org/repos/asf/archiva/blob/30d380e6/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java b/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java index c3c8bfa..4b0d993 100644 --- a/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java +++ b/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java @@ -879,7 +879,7 @@ public class MavenRepositorySearchTest repo.toURI().toURL().toExternalForm(), indexDirectory.toURI().toURL().toString(), search.getAllIndexCreators() ); - SearchResultLimits limits = new SearchResultLimits( 0 ); + SearchResultLimits limits = new SearchResultLimits( SearchResultLimits.ALL_PAGES ); limits.setPageSize( 300 ); EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 5 );
