Index: trunk/modules/beans/src/main/java/java/beans/EventSetDescriptor.java =================================================================== --- trunk/modules/beans/src/main/java/java/beans/EventSetDescriptor.java (revision 448441) +++ trunk/modules/beans/src/main/java/java/beans/EventSetDescriptor.java (working copy) @@ -103,16 +109,16 @@ this.listenerType = listenerType; - if (listenerMethodNames != null) { - for (int i = 0; i < listenerMethodNames.length; ++i) { - try { - listenerMethodDescriptors.add(new MethodDescriptor( - findMethodByName(listenerType, - listenerMethodNames[i]))); - } catch (IntrospectionException ie) { - listenerMethodDescriptors.clear(); - throw ie; - } + if (listenerMethodNames == null) { + throw new NullPointerException(); + } + for (int i = 0; i < listenerMethodNames.length; ++i) { + try { + listenerMethodDescriptors.add(new MethodDescriptor( + findMethodByName(listenerType, listenerMethodNames[i]))); + } catch (IntrospectionException ie) { + listenerMethodDescriptors.clear(); + throw ie; } } @@ -143,16 +149,17 @@ this.listenerType = listenerType; - if (listenerMethodNames != null) { - for (int i = 0; i < listenerMethodNames.length; ++i) { - try { - listenerMethodDescriptors.add(new MethodDescriptor( - findMethodByName(listenerType, - listenerMethodNames[i]))); - } catch (IntrospectionException ie) { - listenerMethodDescriptors.clear(); - throw ie; - } + if (listenerMethodNames == null) { + throw new NullPointerException(); + } + for (int i = 0; i < listenerMethodNames.length; ++i) { + try { + listenerMethodDescriptors.add(new MethodDescriptor( + findMethodByName(listenerType, + listenerMethodNames[i]))); + } catch (IntrospectionException ie) { + listenerMethodDescriptors.clear(); + throw ie; } }