jdk/src/share/classes/java/awt/DefaultKeyboardFocusManager.java
changeset 23239 b9f47a000ebd
parent 20455 f6f9a0c2796b
child 23276 add6f5c93bc6
--- a/jdk/src/share/classes/java/awt/DefaultKeyboardFocusManager.java	Mon Dec 16 17:35:08 2013 +0400
+++ b/jdk/src/share/classes/java/awt/DefaultKeyboardFocusManager.java	Tue Dec 17 11:19:27 2013 +0400
@@ -287,7 +287,7 @@
         synchronized (this) {
             KeyEvent ke = enqueuedKeyEvents.isEmpty() ? null : enqueuedKeyEvents.getFirst();
             if (ke != null && time >= ke.getWhen()) {
-                TypeAheadMarker marker = typeAheadMarkers.getFirst();
+                TypeAheadMarker marker = typeAheadMarkers.isEmpty() ? null : typeAheadMarkers.getFirst();
                 if (marker != null) {
                     Window toplevel = marker.untilFocused.getContainingWindow();
                     // Check that the component awaiting focus belongs to