Fix for #3081/#3015: Added uniqueness check to generated id in IndexedContainer

svn changeset:8226/svn branch:6.0

1 files changed, 12 insertions, 1 deletions

diff --git a/src/com/vaadin/data/util/IndexedContainer.java b/src/com/vaadin/data/util/IndexedContainer.java
index 60686abe22..5e52c729ee 100644
--- a/src/com/vaadin/data/util/IndexedContainer.java
+++ b/src/com/vaadin/data/util/IndexedContainer.java
@@ -670,8 +670,19 @@ public class IndexedContainer implements Container.Indexed,
         return id;
     }
 
+    /**
+     * Generates an unique identifier for use as an item id. Guarantees that the
+     * generated id is not currently used as an id.
+     * 
+     * @return
+     */
     private Serializable generateId() {
-        return new Integer(nextGeneratedItemId++);
+        Serializable id;
+        do {
+            id = new Integer(nextGeneratedItemId++);
+        } while (items.containsKey(id));
+
+        return id;
     }
 
     /* Event notifiers */