Index: modules/beans/src/main/java/java/beans/BeanDescriptor.java =================================================================== --- modules/beans/src/main/java/java/beans/BeanDescriptor.java.orig 2006-03-21 20:52:42.000000000 +0000 +++ modules/beans/src/main/java/java/beans/BeanDescriptor.java 2006-03-21 20:54:00.000000000 +0000 @@ -35,6 +35,8 @@ */ public BeanDescriptor(Class beanClass, Class customizerClass) { super(); + if (beanClass == null) + throw new NullPointerException(); setName(getShortClassName(beanClass)); this.beanClass = beanClass; this.customizerClass = customizerClass; @@ -45,6 +47,8 @@ */ public BeanDescriptor(Class beanClass) { super(); + if (beanClass == null) + throw new NullPointerException(); setName(getShortClassName(beanClass)); this.beanClass = beanClass; } @@ -76,4 +80,4 @@ return result; } -} \ No newline at end of file +} Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/BeanDescriptorTest.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/BeanDescriptorTest.java.orig 2006-03-21 20:52:42.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/BeanDescriptorTest.java 2006-03-21 20:53:29.000000000 +0000 @@ -55,7 +55,22 @@ BeanDescriptor bd= new BeanDescriptor(String.class); assertEquals(bd.getName(), "String"); } - + + public void testNullPointerExpections() { + try { + BeanDescriptor bd = new BeanDescriptor(null); + fail("Constructor BeanDescriptor(null) should "+ + "throw NullPointerException"); + } catch (NullPointerException e) { + } + try { + BeanDescriptor bd = new BeanDescriptor(null, String.class); + fail("Constructor BeanDescriptor(null,Class) should "+ + "throw NullPointerException"); + } catch (NullPointerException e) { + } + } + /** * */