diff options
| author | Leif Åstrand <leif@vaadin.com> | 2014-07-22 12:59:14 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2014-07-22 12:59:32 +0300 |
| commit | 86e1c718578f8c81323b47e3efed03178d123c03 (patch) | |
| tree | 9eaf3779ce79b67963c9fcb3a43c7fd6c39f25fd /server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java | |
| parent | aca2902c9cafcb02db19a0cdd42b1488786c0f56 (diff) | |
| parent | 6ae7843e46ee906adfc99bde71ded5f296caea74 (diff) | |
| download | vaadin-framework-86e1c718578f8c81323b47e3efed03178d123c03.tar.gz vaadin-framework-86e1c718578f8c81323b47e3efed03178d123c03.zip | |
Merge branch 'master' into grid
Change-Id: I6878b3c64eb5c98174537f4e5864e2ff2cb1863f
Diffstat (limited to 'server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java')
| -rw-r--r-- | server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java b/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java index eafd3573bc..0bfec33957 100644 --- a/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java +++ b/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java @@ -701,7 +701,9 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, */ @Override public int size() { - return container.size(); + int size = container.size(); + assert size >= 0; + return size; } /* |