src/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 422,434 ****
  
          @Override
          protected State getState() {
              State rv;
              rv = super.getState();
              if (rv != State.DISABLED
                  && comboBox != null && ! comboBox.isEditable()
!                 && XPStyle.getXP().isSkinDefined(comboBox,
                                                   Part.CP_DROPDOWNBUTTONRIGHT)) {
                  /*
                   * for non editable ComboBoxes Vista seems to have the
                   * same glyph for all non DISABLED states
                   */
--- 422,435 ----
  
          @Override
          protected State getState() {
              State rv;
              rv = super.getState();
+             XPStyle xp = XPStyle.getXP();
              if (rv != State.DISABLED
                  && comboBox != null && ! comboBox.isEditable()
!                 && xp != null && xp.isSkinDefined(comboBox,
                                                    Part.CP_DROPDOWNBUTTONRIGHT)) {
                  /*
                   * for non editable ComboBoxes Vista seems to have the
                   * same glyph for all non DISABLED states
                   */