--- old/src/java.desktop/macosx/native/libosxapp/NSApplicationAWT.m	2015-06-25 18:45:46.396878000 +0300
+++ new/src/java.desktop/macosx/native/libosxapp/NSApplicationAWT.m	2015-06-25 18:45:45.970323800 +0300
@@ -398,8 +398,14 @@
     [pool drain];
 }
 
-- (void)waitForDummyEvent {
-    [seenDummyEventLock lockWhenCondition:YES];
+- (void)waitForDummyEvent:(long long) timeout {
+    if (timeout >= 0) {
+        double sec = ((double) timeout)/1000;
+        [seenDummyEventLock lockWhenCondition:YES
+                               beforeDate:[NSDate dateWithTimeIntervalSinceNow:sec]];
+    } else {
+        [seenDummyEventLock lockWhenCondition:YES];
+    }
     [seenDummyEventLock unlock];
     [seenDummyEventLock release];