From 90df629d46060ceb3ce81cc814d19eefd28d1f2d Mon Sep 17 00:00:00 2001
From: dav <unknown>
Date: Fri, 1 Apr 2011 12:56:56 +0400
Subject: [PATCH] 6984540:
 closed/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.html
 test fails Reviewed-by: uta, art

---
 src/windows/native/sun/windows/awt_Toolkit.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/windows/native/sun/windows/awt_Toolkit.cpp b/src/windows/native/sun/windows/awt_Toolkit.cpp
index cab78049f..687dc8b5a 100644
--- a/src/windows/native/sun/windows/awt_Toolkit.cpp
+++ b/src/windows/native/sun/windows/awt_Toolkit.cpp
@@ -528,9 +528,6 @@ BOOL AwtToolkit::Dispose() {
 
     tk.m_isActive = FALSE;
 
-    awt_dnd_uninitialize();
-    awt_clipboard_uninitialize((JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2));
-
     // dispose Direct3D-related resources. This should be done
     // before AwtObjectList::Cleanup() as the d3d will attempt to
     // shutdown when the last of its windows is disposed of
@@ -539,6 +536,9 @@ BOOL AwtToolkit::Dispose() {
     AwtObjectList::Cleanup();
     AwtFont::Cleanup();
 
+    awt_dnd_uninitialize();
+    awt_clipboard_uninitialize((JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2));
+
     if (tk.m_inputMethodHWnd != NULL) {
         ::SendMessage(tk.m_inputMethodHWnd, WM_IME_CONTROL, IMC_OPENSTATUSWINDOW, 0);
     }
-- 
GitLab