(original) (raw)

diff --git src/share/classes/javax/swing/text/DefaultCaret.java src/share/classes/javax/swing/text/DefaultCaret.java index ecbfdf0..48547f2 100644 --- src/share/classes/javax/swing/text/DefaultCaret.java +++ src/share/classes/javax/swing/text/DefaultCaret.java @@ -403,6 +403,10 @@ public class DefaultCaret extends Rectangle implements Caret, FocusListener, Mou * @see MouseListener#mouseClicked */ public void mouseClicked(MouseEvent e) { + if (getComponent() == null) { + return; + } + int nclicks = SwingUtilities2.getAdjustedClickCount(getComponent(), e); if (! e.isConsumed()) {