commit e06ad08fd438f6070be2c0bf4e69a9178db67863
author Anthony Petrov <anthony@openjdk.org> Fri Apr 17 16:16:14 2009 +0400
committer Anthony Petrov <anthony@openjdk.org> Fri Apr 17 16:16:14 2009 +0400
tree d91b8e37b1fc0e141b3f43814e542f34d5a46236
parent 4f420274a7fcdeb69fe17fc6fbf22bd95a43772e

6826104: Getting a NullPointer exception when clicked on Application & Toolkit Modal dialog

The addition of window peers to the windows collection has been restored in XWindowPeer.

Reviewed-by: art, dcherepanov

jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java

diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java
index 41807db..d3fb210 100644
--- a/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java
+++ b/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java
@@ -146,6 +146,13 @@
 
         params.put(OVERRIDE_REDIRECT, Boolean.valueOf(isOverrideRedirect()));
 
+        SunToolkit.awtLock();
+        try {
+            windows.add(this);
+        } finally {
+            SunToolkit.awtUnlock();
+        }
+
         cachedFocusableWindow = isFocusableWindow();
 
         Font f = target.getFont();