From 32c2b216c0d21b7e0f5c175afc8beef34aeb95c5 Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Fri, 2 Dec 2016 17:18:07 +0300
Subject: [PATCH] mem leaks: clear CWindow listeners and rootPane: NPE in
 recycled popups on Linux

---
 .../src/com/intellij/openapi/ui/DialogWrapper.java        | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
index 03ee6a9b2b25..889b16aaa380 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
@@ -949,9 +949,15 @@ public abstract class DialogWrapper {
 
   public static void cleanupRootPane(@Nullable JRootPane rootPane) {
     if (rootPane == null) return;
+    rootPane.setContentPane(new JPanel());
+    rootPane.setGlassPane(new JPanel());
     RepaintManager.currentManager(rootPane).removeInvalidComponent(rootPane);
     unregisterKeyboardActions(rootPane);
-    Disposer.clearOwnFields(rootPane, field -> !field.getDeclaringClass().getName().startsWith("java.awt."));
+    Disposer.clearOwnFields(rootPane, field -> {
+      // keep AWT and Swing fields intact
+      String name = field.getDeclaringClass().getName();
+      return !(name.startsWith("java.") || name.startsWith("javax."));
+    });
   }
 
   private static void unregisterKeyboardActions(@Nullable JRootPane rootPane) {