7011446: ./windows/classes/sun/awt/windows/WToolkit.java needs to avoid spurious wakeup

Reviewed-by: anthony

src/windows/classes/sun/awt/windows/WToolkit.java

@@ -228,12 +228,6 @@ public class WToolkit extends SunToolkit implements Runnable {
 
         sun.java2d.Disposer.addRecord(anchor, new ToolkitDisposer());
 
-        synchronized (this) {
-            // Fix for bug #4046430 -- Race condition
-            // where notifyAll can be called before
-            // the "AWT-Windows" thread's parent thread is
-            // waiting, resulting in a deadlock on startup.
-
         /*
          * Fix for 4701990.
          * AWTAutoShutdown state must be changed before the toolkit thread
@@ -248,11 +242,15 @@ public class WToolkit extends SunToolkit implements Runnable {
         }
 
         try {
+            synchronized(this) {
+                while(!inited) {
                     wait();
                 }
-            catch (InterruptedException x) {
             }
+        } catch (InterruptedException x) {
+            // swallow the exception
         }
+
         SunToolkit.setDataTransfererClassName(DATA_TRANSFERER_CLASS_NAME);
 
         // Enabled "live resizing" by default.  It remains controlled
@@ -265,11 +263,7 @@ public class WToolkit extends SunToolkit implements Runnable {
         setExtraMouseButtonsEnabledNative(areExtraMouseButtonsEnabled);
     }
 
-    public void run() {
-        Thread.currentThread().setPriority(Thread.NORM_PRIORITY+1);
-        boolean startPump = init();
-
-        if (startPump) {
+    private final void registerShutdownHook() {
         AccessController.doPrivileged(new PrivilegedAction() {
             public Object run() {
                 ThreadGroup currentTG =
@@ -291,7 +285,16 @@ public class WToolkit extends SunToolkit implements Runnable {
         });
      }
 
+    public void run() {
+        Thread.currentThread().setPriority(Thread.NORM_PRIORITY+1);
+        boolean startPump = init();
+
+        if (startPump) {
+            registerShutdownHook();
+        }
+
         synchronized(this) {
+            inited = true;
             notifyAll();
         }
 
@@ -309,6 +312,8 @@ public class WToolkit extends SunToolkit implements Runnable {
      * eventLoop() should Dispose the toolkit and exit.
      */
     private native boolean init();
+    private boolean inited = false;
+
     private native void eventLoop();
     private native void shutdown();