From 891da0ff84f58283d1479bfc9eee17d356c91982 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Tue, 19 May 2015 16:21:20 +0300 Subject: [PATCH] EA-39114 - NPE: DataManager.getInstance re-fixed --- .../openapi/keymap/impl/IdeKeyEventDispatcher.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java index ed9185a43230..1f8b4d6717f1 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java @@ -198,12 +198,9 @@ public final class IdeKeyEventDispatcher implements Disposable { Window focusedWindow = focusManager.getFocusedWindow(); boolean isModalContext = focusedWindow != null && isModalContext(focusedWindow); - if (ApplicationManager.getApplication() == null) return false; //EA-39114 - - final DataManager dataManager = DataManager.getInstance(); - if (dataManager == null) return false; - - DataContext dataContext = dataManager.getDataContext(); + Application application = ApplicationManager.getApplication(); + if (application == null) return false; // WTF? + DataContext dataContext = application.getComponent(DataManager.class).getDataContext(); myContext.setDataContext(dataContext); myContext.setFocusOwner(focusOwner);