8155001: SystemTray.remove() leaks GDI Objects in Windows

Reviewed-by: serb, alexp
2016-05-13 12:44:53 +03:00 · 2016-05-13 12:44:53 +03:00 · 7a40b8d5f7
commit 7a40b8d5f7
parent e931bc512f
1 changed files with 6 additions and 0 deletions
--- a/jdk/src/java.desktop/windows/native/libawt/windows/awt_TrayIcon.cpp
+++ b/jdk/src/java.desktop/windows/native/libawt/windows/awt_TrayIcon.cpp
@ -93,6 +93,12 @@ AwtTrayIcon::~AwtTrayIcon() {

 void AwtTrayIcon::Dispose() {
    SendTrayMessage(NIM_DELETE);
+
+    // Destroy the icon to avoid leak of GDI objects
+    if (m_nid.hIcon != NULL) {
+        ::DestroyIcon(m_nid.hIcon);
+    }
+
    UnlinkObjects();

    if (--sm_instCount == 0) {