From: Artur Signell <artur.signell@itmill.com>
Date: Mon, 1 Mar 2010 15:44:39 +0000 (+0000)
Subject: #4250 - IndexedContainer.nextItemId should return null for item ids not in container
X-Git-Tag: 6.7.0.beta1~2012
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6b3d7c1d61c43bf03c2cc99053eb393457e71df4;p=vaadin-framework.git

#4250 - IndexedContainer.nextItemId should return null for item ids not in container

svn changeset:11567/svn branch:6.3
---

diff --git a/src/com/vaadin/data/util/IndexedContainer.java b/src/com/vaadin/data/util/IndexedContainer.java
index 048d868ee0..1d2726cdeb 100644
--- a/src/com/vaadin/data/util/IndexedContainer.java
+++ b/src/com/vaadin/data/util/IndexedContainer.java
@@ -469,7 +469,13 @@ public class IndexedContainer implements Container.Indexed,
             return null;
         }
         try {
-            return itemIds.get(itemIds.indexOf(itemId) + 1);
+            int idx = itemIds.indexOf(itemId);
+            if (idx == -1) {
+                // If the given Item is not found in the Container,
+                // null is returned.
+                return null;
+            }
+            return itemIds.get(idx + 1);
         } catch (final IndexOutOfBoundsException e) {
             return null;
         }