Skip to content

Commit 18345c3

Browse files
joshuacordsbrianchandotcom
authored andcommitted
LPD-65239 portal-search: allow size 0 searches for counts
https://liferay.atlassian.net/browse/LPD-65239
1 parent 6877366 commit 18345c3

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

modules/apps/portal-search/portal-search/src/main/java/com/liferay/portal/search/internal/permission/DefaultSearchResultPermissionFilter.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -824,10 +824,8 @@ public SlidingWindowHelper(int start, int end) {
824824
_start = start;
825825
_end = end;
826826

827-
_delta = end - start;
828-
829-
_documents = new CircularFifoQueue<>(_delta);
830-
_scores = new CircularFifoQueue<>(_delta);
827+
_documents = new CircularFifoQueue<>(Math.max(1, end - start));
828+
_scores = new CircularFifoQueue<>(Math.max(1, end - start));
831829
}
832830

833831
public boolean add(Document document, Float score) {
@@ -869,7 +867,6 @@ public int getTotalDocs() {
869867
return _totalDocs;
870868
}
871869

872-
private final int _delta;
873870
private final CircularFifoQueue<Document> _documents;
874871
private int _documentsDiscarded;
875872
private final int _end;

modules/apps/portal-search/portal-search/src/test/java/com/liferay/portal/search/internal/permission/DefaultSearchResultPermissionFilterTest.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,16 @@
2323
import com.liferay.portal.search.searcher.SearchRequest;
2424
import com.liferay.portal.search.searcher.SearchRequestBuilder;
2525
import com.liferay.portal.test.rule.LiferayUnitTestRule;
26+
27+
import java.util.Arrays;
28+
import java.util.function.Function;
29+
2630
import org.junit.Assert;
2731
import org.junit.ClassRule;
2832
import org.junit.Rule;
2933
import org.junit.Test;
30-
import org.mockito.Mockito;
3134

32-
import java.util.Arrays;
33-
import java.util.function.Function;
35+
import org.mockito.Mockito;
3436

3537
/**
3638
* @author Gustavo Lima

0 commit comments

Comments
 (0)