changeset 2454:5e4969391538

6735259: NPE at WindowsComboBoxUI$XPComboBoxButton.getState(WindowsComboBoxUI.java:408) Reviewed-by: rupashka
author alexp
date Tue, 15 Jun 2010 19:10:42 +0400
parents cf13f6389bdd
children cd565c554dc6
files src/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java	Tue Jun 15 19:05:44 2010 +0400
+++ b/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)) {
                 /*