# HG changeset patch
# User alexp
# Date 1284750979 -14400
# Node ID 9fccd23d71999da7987cae10dddf4d72f6acd3db
# Parent  3a9910603ab2b5390d70c8dd3eb674241bcbdcdd
6576054: NullPointerException when closing tooltip by pressing esc
Reviewed-by: rupashka

diff -r 3a9910603ab2 -r 9fccd23d7199 jdk/src/share/classes/javax/swing/ToolTipManager.java
--- a/jdk/src/share/classes/javax/swing/ToolTipManager.java	Fri Sep 17 23:09:29 2010 +0400
+++ b/jdk/src/share/classes/javax/swing/ToolTipManager.java	Fri Sep 17 23:16:19 2010 +0400
@@ -459,7 +459,7 @@
         if (insideComponent == null) {
             // Drag exit
         }
-        if (window != null && event.getSource() == window) {
+        if (window != null && event.getSource() == window && insideComponent != null) {
           // if we get an exit and have a heavy window
           // we need to check if it if overlapping the inside component
             Container insideComponentWindow = insideComponent.getTopLevelAncestor();