diff options
Diffstat (limited to 'compatibility-server/src')
| -rw-r--r-- | compatibility-server/src/main/java/com/vaadin/v7/ui/ComboBox.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/ComboBox.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/ComboBox.java index aaccdb8b25..f502aedd8e 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/ComboBox.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/ComboBox.java @@ -620,7 +620,9 @@ public class ComboBox extends AbstractSelect // page length usable for non-null items int effectivePageLength = pageLength - (needNullSelectOption && (currentPage == 0) ? 1 : 0); - return Math.min(size - 1, first + effectivePageLength - 1); + // zero pageLength implies infinite page size + return pageLength == 0 ? size - 1 + : Math.min(size - 1, first + effectivePageLength - 1); } /** |