commit 498431673d4fe13de69ec4809a546154addabe5e
author Denis Fokin <denis.fokin@jetbrains.com> Fri Sep 21 14:16:25 2018 +0300
committer Denis Fokin <denis.fokin@jetbrains.com> Fri Sep 21 14:16:25 2018 +0300
tree 8dab056142ff8d35728b852725513f9f9b6bbeb1
parent 8e1496a75e6c97c668f14a9e7c1458a263300bdd

JRE-953 Focus goes behind 'Replace in Path' / "Find in path" dialogs  Review improvements

NPE

src/macosx/classes/sun/lwawt/LWWindowPeer.java

diff --git a/src/macosx/classes/sun/lwawt/LWWindowPeer.java b/src/macosx/classes/sun/lwawt/LWWindowPeer.java
index 7e5b693..8c912ec 100644
--- a/src/macosx/classes/sun/lwawt/LWWindowPeer.java
+++ b/src/macosx/classes/sun/lwawt/LWWindowPeer.java
@@ -1333,7 +1333,8 @@
             // 2. Save the window as a previously focused
             previouslyFocusedWindow = focusedWindow;
         } else if (becomesFocused && previouslyFocusedWindow != null) {
-            if (((LWWindowPeer)previouslyFocusedWindow.getPeer()).focusAllowedFor()) {
+          LWWindowPeer focusedWindowPeer = (LWWindowPeer)previouslyFocusedWindow.getPeer();
+          if (focusedWindowPeer != null && focusedWindowPeer.focusAllowedFor()) {
                 // 3. Use the previous focused window
                 eventWindow = previouslyFocusedWindow;
             }