Merged test case and fix for #2796: Throw an error if the same debugId is used for multiple components

http://dev.itmill.com/ticket/2796

svn changeset:7139/svn branch:6.0

1 files changed, 18 insertions, 1 deletions

diff --git a/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java b/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java
index 7510c401ef..16281a3c8a 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java
@@ -1110,8 +1110,25 @@ public class CommunicationManager implements Paintable.RepaintRequestListener {
             } else {
                 id = "PID_S" + id;
             }
+            Paintable old = idPaintableMap.put(id, paintable);
+            if (old != null && old != paintable) {
+                /*
+                 * Two paintables have the same id. We still make sure the old
+                 * one is a component which is still attached to the
+                 * application. This is just a precaution and should not be
+                 * absolutely necessary.
+                 */
+
+                if (old instanceof Component
+                        && ((Component) old).getApplication() != null) {
+                    throw new IllegalStateException("Two paintables ("
+                            + paintable.getClass().getSimpleName() + ","
+                            + old.getClass().getSimpleName()
+                            + ") have been assigned the same id: "
+                            + paintable.getDebugId());
+                }
+            }
             paintableIdMap.put(paintable, id);
-            idPaintableMap.put(id, paintable);
         }
 
         return id;