--- old/src/java.desktop/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java	2015-07-17 19:15:20.311040800 +0300
+++ new/src/java.desktop/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java	2015-07-17 19:15:19.669540800 +0300
@@ -194,8 +194,8 @@
             return localTransferable.getTransferDataFlavors();
         } else {
             return DataTransferer.getInstance().getFlavorsForFormatsAsArray
-                (currentT, DataTransferer.adaptFlavorMap
-                    (currentDT.getFlavorMap()));
+                    (currentT, DataTransferer.adaptFlavorMap
+                            (currentDT.getFlavorMap()));
         }
     }
 
@@ -908,7 +908,7 @@
                  * Clear the reference to the native context if all copies of
                  * the original event are processed.
                  */
-                if (dispatcherDone) {
+                if (dispatcherDone && !peer.dropInProcess) {
                     nativeCtxt = 0;
                     // Fix for 6342381
                     peer.nativeDragContext = 0;