From 6da6f37502d2c1ba19881d76d63e4227b3b1439d Mon Sep 17 00:00:00 2001 From: John Alhroos Date: Thu, 9 Dec 2010 15:35:34 +0000 Subject: [PATCH] NPE fix. svn changeset:16435/svn branch:6.5 --- .../gwt/client/ui/dd/VDragAndDropManager.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) 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 aa5b75242f..19ab89622b 100644 --- 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; -- 2.39.5