summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2015-10-09 11:35:01 +0300
committerVaadin Code Review <review@vaadin.com>2015-10-09 10:54:00 +0000
commitb73e0d8885ae015b2dcc749065063c006f3bb5cc (patch)
tree133c1bf3bf73f54190456dd89752ef2a95655662
parent98f9c438d8d03c4dbc5d896ef245d252a166b9ed (diff)
downloadvaadin-framework-b73e0d8885ae015b2dcc749065063c006f3bb5cc.tar.gz
vaadin-framework-b73e0d8885ae015b2dcc749065063c006f3bb5cc.zip
Fix stack overflows in ListDataSource ListWrapper (#19104)
Change-Id: Ie04e673fcdb3ce0f63b07158b5cd9f128ea9c30e
-rw-r--r--client/src/com/vaadin/client/widget/grid/datasources/ListDataSource.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/client/src/com/vaadin/client/widget/grid/datasources/ListDataSource.java b/client/src/com/vaadin/client/widget/grid/datasources/ListDataSource.java
index 46e972b3e8..cf7ec53e68 100644
--- a/client/src/com/vaadin/client/widget/grid/datasources/ListDataSource.java
+++ b/client/src/com/vaadin/client/widget/grid/datasources/ListDataSource.java
@@ -134,7 +134,7 @@ public class ListDataSource<T> implements DataSource<T> {
@Override
public boolean contains(Object o) {
- return contains(o);
+ return ds.contains(o);
}
@Override
@@ -150,7 +150,7 @@ public class ListDataSource<T> implements DataSource<T> {
@Override
@SuppressWarnings("hiding")
public <T> T[] toArray(T[] a) {
- return toArray(a);
+ return ds.toArray(a);
}
@Override