From: Leif Åstrand <leif@vaadin.com>
Date: Wed, 15 Feb 2012 07:31:53 +0000 (+0200)
Subject: Merge remote branch 'origin/6.8'
X-Git-Tag: 7.0.0.alpha2~447
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e91601dc67ee61e44f7e5e9689890073445e2bba;p=vaadin-framework.git

Merge remote branch 'origin/6.8'
---

e91601dc67ee61e44f7e5e9689890073445e2bba
diff --cc src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
index 86f2c7a2de,4454287ae9..705bf13346
--- a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
@@@ -1233,13 -1385,27 +1233,17 @@@ public abstract class AbstractCommunica
                  }
                  try {
                      changeVariables(source, owner, m);
 -
 -                    // Special-case of closing browser-level windows:
 -                    // track browser-windows currently open in client
 -                    if (owner instanceof Window
 -                            && ((Window) owner).getParent() == null) {
 -                        final Boolean close = (Boolean) m.get("close");
 -                        if (close != null && close.booleanValue()) {
 -                            closingWindowName = ((Window) owner).getName();
 -                        }
 -                    }
                  } catch (Exception e) {
+                     Component errorComponent = null;
                      if (owner instanceof Component) {
-                         handleChangeVariablesError(app, (Component) owner, e, m);
-                     } else {
-                         // TODO DragDropService error handling
-                         throw new RuntimeException(e);
+                         errorComponent = (Component) owner;
+                     } else if (owner instanceof DragAndDropService) {
+                         if (m.get("dhowner") instanceof Component) {
+                             errorComponent = (Component) m.get("dhowner");
+                         }
                      }
+ 
+                     handleChangeVariablesError(app, errorComponent, e, m);
                  }
              } else {