Index: modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicLabelUITest.java =================================================================== --- modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicLabelUITest.java (revision 490707) +++ modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicLabelUITest.java (working copy) @@ -102,4 +102,26 @@ ui.installComponents(label); assertEquals(0, label.getComponentCount()); } + + private class BasicLabelUIForTest extends BasicLabelUI { + public BasicLabelUIForTest(){ + super(); + } + + public void uninstallDefaults(JLabel l) { + super.uninstallDefaults(l); + } + } + + /** + * Regression test for HARMONY-2637 + * */ + public void testUninstallDefaults() { + BasicLabelUIForTest bu = new BasicLabelUIForTest(); + try { + bu.uninstallDefaults(null); + } catch (NullPointerException e) { + fail("NPE thrown"); + } + } }