Index: src/test/api/java/common/javax/swing/JComponentTest.java =================================================================== --- src/test/api/java/common/javax/swing/JComponentTest.java (revision 490924) +++ src/test/api/java/common/javax/swing/JComponentTest.java (working copy) @@ -1071,6 +1071,14 @@ changeListener.checkLastPropertyFired(panel, key1, value2, null); assertNull(panel.getClientProperty(key1)); changeListener.reset(); + + try { + JComponent jc = new JComponent() {}; + jc.putClientProperty(null, new Object()); + fail("NPE should be thrown"); + } catch (NullPointerException npe) { + // PASSED + } } /*