MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

EA-39114 - NPE: DataManager.getInstance re-fixed

Browse Source
This commit is contained in:
Dmitry Avdeev
2015-05-21 15:58:59 +03:00
parent deb34c0cf9
commit 891da0ff84
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java
+3 -6
View File
@@ -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);