# HG changeset patch
# User alexp
# Date 1276614642 -14400
# Node ID d4e3919ddf5ce9f13019975af1f7b494de728057
# Parent  585ea61436f7dd95f6f68b991fba4d649a288a06
6735259: NPE at WindowsComboBoxUI$XPComboBoxButton.getState(WindowsComboBoxUI.java:408)
Reviewed-by: rupashka

diff -r 585ea61436f7 -r d4e3919ddf5c jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java
--- 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)) {
                 /*