From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Mon, 10 Nov 2008 11:00:05 +0000 (+0000)
Subject: bug fix
X-Git-Tag: 6.7.0.beta1~3850
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a7b741479616ed30d55cd03f82f568ccb9d33f4e;p=vaadin-framework.git

bug fix

svn changeset:5839/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
index b2d54be76b..827c6353de 100755
--- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
@@ -577,11 +577,11 @@ public class ApplicationConnection {
                 final UIDL uidl = change.getChildUIDL(0);
                 final Paintable paintable = getPaintable(uidl.getId());
                 if (paintable != null) {
-                    Widget widget = (Widget) paintable;
-
                     paintable.updateFromUIDL(uidl, this);
-
-                    updatedWidgets.add(widget);
+                    // paintable may have changed during render to another
+                    // implementation, use the new one for updated widgets map
+                    updatedWidgets
+                            .add((Widget) idToPaintable.get(uidl.getId()));
                 } else {
                     if (!uidl.getTag().equals("window")) {
                         ClientExceptionHandler