NPE fix.

svn changeset:16435/svn branch:6.5

diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java
index aa5b75242f9aff55b4f25155490bff0e8a027e7c..19ab89622bd0af42ef8c8c856612e60c3557632a 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java
@@ -364,8 +364,10 @@ public class VDragAndDropManager {
                                     break;
                                 }
                             case Event.ONMOUSEMOVE:
-                                deferredStartRegistration.removeHandler();
-                                deferredStartRegistration = null;
+                                if (deferredStartRegistration != null) {
+                                    deferredStartRegistration.removeHandler();
+                                    deferredStartRegistration = null;
+                                }
                                 currentDrag.setCurrentGwtEvent(event
                                         .getNativeEvent());
                                 startDrag.execute();
@@ -373,9 +375,10 @@ public class VDragAndDropManager {
                             default:
                                 // on any other events, clean up the
                                 // deferred drag start
-
-                                deferredStartRegistration.removeHandler();
-                                deferredStartRegistration = null;
+                                if (deferredStartRegistration != null) {
+                                    deferredStartRegistration.removeHandler();
+                                    deferredStartRegistration = null;
+                                }
                                 currentDrag = null;
                                 clearDragElement();
                                 break;