6735259: NPE at WindowsComboBoxUI$XPComboBoxButton.getState(WindowsComboBoxUI.java:408)

Reviewed-by: rupashka
2010-06-15 19:10:42 +04:00 · 2010-06-15 19:10:42 +04:00 · b96bd0ebfc
commit b96bd0ebfc
parent db380d5775
1 changed files with 1 additions and 1 deletions
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java
@ -424,7 +424,7 @@ public class WindowsComboBoxUI extends BasicComboBoxUI {
            State rv;
            rv = super.getState();
            if (rv != State.DISABLED
-                && ! comboBox.isEditable()
+                && comboBox != null && ! comboBox.isEditable()
                && XPStyle.getXP().isSkinDefined(comboBox,
                                                 Part.CP_DROPDOWNBUTTONRIGHT)) {
                /*