From e5328b0931ba4bb50445997b7d966076d1294bb0 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 8 Dec 2010 17:14:01 +0300
Subject: [PATCH] [by kirill.kalishev] NPE in DnD manager  (on dragging Docky
 icon over project view)

---
 .../src/com/intellij/ide/dnd/DnDManagerImpl.java             | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/dnd/DnDManagerImpl.java b/platform/platform-impl/src/com/intellij/ide/dnd/DnDManagerImpl.java
index c15a469c8915..b1c9ac1ed33b 100644
--- a/platform/platform-impl/src/com/intellij/ide/dnd/DnDManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/ide/dnd/DnDManagerImpl.java
@@ -159,7 +159,10 @@ public class DnDManagerImpl extends DnDManager implements DnDEvent.DropTargetHig
 
     if (currentEvent == null) return currentEvent;
 
-    currentEvent.updateAction(getDnDActionForPlatformAction(nativeAction));
+    final DnDAction dndAction = getDnDActionForPlatformAction(nativeAction);
+    if (dndAction == null) return null;
+
+    currentEvent.updateAction(dndAction);
     currentEvent.setPoint(aPoint);
     currentEvent.setHandlerComponent(aComponentOverDragging);