[merge from 6.7] #8373 Handler DragAndDropService changeVariables error by finding the drop target and using that for error reporting

svn changeset:23013/svn branch:6.8

1 files changed, 8 insertions, 4 deletions

diff --git a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
index e96f2d2b56..4454287ae9 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
@@ -1396,12 +1396,16 @@ public abstract class AbstractCommunicationManager implements
                         }
                     }
                 } 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 {