--- old/src/java.desktop/share/classes/java/awt/WaitDispatchSupport.java	2015-03-30 14:43:29.312313300 +0300
+++ new/src/java.desktop/share/classes/java/awt/WaitDispatchSupport.java	2015-03-30 14:43:28.838313300 +0300
@@ -46,9 +46,8 @@
  * @since 1.7
  */
 class WaitDispatchSupport implements SecondaryLoop {
-
     private final static PlatformLogger log =
-        PlatformLogger.getLogger("java.awt.event.WaitDispatchSupport");
+            PlatformLogger.getLogger("java.awt.event.WaitDispatchSupport");
 
     private EventDispatchThread dispatchThread;
     private EventFilter filter;
@@ -65,6 +64,7 @@
 
     private AtomicBoolean keepBlockingEDT = new AtomicBoolean(false);
     private AtomicBoolean keepBlockingCT = new AtomicBoolean(false);
+    private AtomicBoolean afterExit = new AtomicBoolean(false);
 
     private static synchronized void initializeTimer() {
         if (timer == null) {
@@ -77,7 +77,7 @@
      * serve the given event dispatch thread.
      *
      * @param dispatchThread An event dispatch thread that
-     *        should not stop dispatching events while waiting
+     *                       should not stop dispatching events while waiting
      *
      * @since 1.7
      */
@@ -114,7 +114,7 @@
                 }
                 boolean extEvaluate =
                     (extCondition != null) ? extCondition.evaluate() : true;
-                if (!keepBlockingEDT.get() || !extEvaluate) {
+                if (!keepBlockingEDT.get() || !extEvaluate || afterExit.get()) {
                     if (timerTask != null) {
                         timerTask.cancel();
                         timerTask = null;
@@ -174,6 +174,10 @@
             log.fine("The secondary loop is already running, aborting");
             return false;
         }
+        if(afterExit.getAndSet(false)) {
+            log.fine("Exit was called already, aborting");
+            return false;
+        }
 
         final Runnable run = new Runnable() {
             public void run() {
@@ -230,54 +234,58 @@
                     return null;
                 }
             });
+            return true;
         } else {
             if (log.isLoggable(PlatformLogger.Level.FINEST)) {
                 log.finest("On non-dispatch thread: " + currentThread);
             }
+            keepBlockingCT.set(true);
             synchronized (getTreeLock()) {
-                if (filter != null) {
-                    dispatchThread.addEventFilter(filter);
-                }
-                try {
-                    EventQueue eq = dispatchThread.getEventQueue();
-                    eq.postEvent(new PeerEvent(this, run, PeerEvent.PRIORITY_EVENT));
-                    keepBlockingCT.set(true);
-                    if (interval > 0) {
-                        long currTime = System.currentTimeMillis();
-                        while (keepBlockingCT.get() &&
-                               ((extCondition != null) ? extCondition.evaluate() : true) &&
-                               (currTime + interval > System.currentTimeMillis()))
-                        {
-                            getTreeLock().wait(interval);
+                if (!afterExit.getAndSet(false)) {
+                    if (filter != null) {
+                        dispatchThread.addEventFilter(filter);
+                    }
+                    try {
+                        EventQueue eq = dispatchThread.getEventQueue();
+                        eq.postEvent(new PeerEvent(this, run, PeerEvent.PRIORITY_EVENT));
+                        if (interval > 0) {
+                            long currTime = System.currentTimeMillis();
+                            while (keepBlockingCT.get() &&
+                                   ((extCondition != null) ? extCondition.evaluate() : true) &&
+                                   (currTime + interval > System.currentTimeMillis()))
+                            {
+                                getTreeLock().wait(interval);
+                            }
+                        } else {
+                            while (keepBlockingCT.get() &&
+                                   ((extCondition != null) ? extCondition.evaluate() : true))
+                            {
+                                getTreeLock().wait();
+                            }
                         }
-                    } else {
-                        while (keepBlockingCT.get() &&
-                               ((extCondition != null) ? extCondition.evaluate() : true))
-                        {
-                            getTreeLock().wait();
+                        if (log.isLoggable(PlatformLogger.Level.FINE)) {
+                            log.fine("waitDone " + keepBlockingEDT.get() + " " + keepBlockingCT.get());
+                        }
+                    } catch (InterruptedException e) {
+                        if (log.isLoggable(PlatformLogger.Level.FINE)) {
+                            log.fine("Exception caught while waiting: " + e);
+                        }
+                    } finally {
+                        if (filter != null) {
+                            dispatchThread.removeEventFilter(filter);
                         }
                     }
-                    if (log.isLoggable(PlatformLogger.Level.FINE)) {
-                        log.fine("waitDone " + keepBlockingEDT.get() + " " + keepBlockingCT.get());
-                    }
-                } catch (InterruptedException e) {
-                    if (log.isLoggable(PlatformLogger.Level.FINE)) {
-                        log.fine("Exception caught while waiting: " + e);
-                    }
-                } finally {
-                    if (filter != null) {
-                        dispatchThread.removeEventFilter(filter);
-                    }
+                    // If the waiting process has been stopped because of the
+                    // time interval passed or an exception occurred, the state
+                    // should be changed
+                    keepBlockingEDT.set(false);
+                    keepBlockingCT.set(false);
+                    return true;
                 }
-                // If the waiting process has been stopped because of the
-                // time interval passed or an exception occurred, the state
-                // should be changed
-                keepBlockingEDT.set(false);
                 keepBlockingCT.set(false);
+                return false;
             }
         }
-
-        return true;
     }
 
     /**
@@ -286,13 +294,12 @@
     public boolean exit() {
         if (log.isLoggable(PlatformLogger.Level.FINE)) {
             log.fine("exit(): blockingEDT=" + keepBlockingEDT.get() +
-                     ", blockingCT=" + keepBlockingCT.get());
-        }
-        if (keepBlockingEDT.compareAndSet(true, false)) {
-            wakeupEDT();
-            return true;
+                    ", blockingCT=" + keepBlockingCT.get());
         }
-        return false;
+        afterExit.set(true);
+        boolean noEnter = !keepBlockingEDT.getAndSet(false);
+        wakeupEDT();
+        return noEnter;
     }
 
     private final static Object getTreeLock() {