6735259: NPE at WindowsComboBoxUI$XPComboBoxButton.getState(WindowsComboBoxUI.java:408)
Reviewed-by: rupashka
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java Tue Jun 15 19:05:44 2010 +0400
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java Tue Jun 15 19:10:42 2010 +0400
@@ -424,7 +424,7 @@
State rv;
rv = super.getState();
if (rv != State.DISABLED
- && ! comboBox.isEditable()
+ && comboBox != null && ! comboBox.isEditable()
&& XPStyle.getXP().isSkinDefined(comboBox,
Part.CP_DROPDOWNBUTTONRIGHT)) {
/*