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

Reviewed-by: rupashka

6735259: NPE at WindowsComboBoxUI$XPComboBoxButton.getState(WindowsComboBoxUI.java:408)
Reviewed-by: rupashka
1c8702bd · alexp · d4cdbfbd · 1c8702bd
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

src/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java ...es/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java +1 -1

未找到文件。
--- a/src/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java
+++ b/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)) {
                /*