From 8f01802d8b89180a50007bc14395bbcc56f2db5f Mon Sep 17 00:00:00 2001 From: Denis Fokin Date: Wed, 1 Mar 2017 16:16:36 +0300 Subject: [PATCH] EA-92696 - NPE: SwingUtilities.getWindowAncestor --- .../platform-impl/src/com/intellij/ide/IdePopupManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/ide/IdePopupManager.java b/platform/platform-impl/src/com/intellij/ide/IdePopupManager.java index 94c788ffc259..203da3358675 100644 --- a/platform/platform-impl/src/com/intellij/ide/IdePopupManager.java +++ b/platform/platform-impl/src/com/intellij/ide/IdePopupManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,6 +30,7 @@ import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; import java.awt.event.WindowEvent; import java.util.List; +import java.util.Objects; public final class IdePopupManager implements IdeEventQueue.EventDispatcher { private static final Logger LOG = Logger.getInstance("com.intellij.ide.IdePopupManager"); @@ -133,6 +134,7 @@ public final class IdePopupManager implements IdeEventQueue.EventDispatcher { return myDispatchStack.stream() .flatMap(IdePopupEventDispatcher::getPopupStream) .map(JBPopup::getContent) + .filter(Objects::nonNull) .anyMatch(jbPopupContent -> SwingUtilities.getWindowAncestor(jbPopupContent) == w); } }