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) @@ -192,14 +199,10 @@ } } - this.addListenerMethod = checkRegistrationMethod(listenerType, - addListenerMethod); - this.removeListenerMethod = checkRegistrationMethod(listenerType, - removeListenerMethod); + this.addListenerMethod = addListenerMethod; + this.removeListenerMethod = removeListenerMethod; this.getListenerMethod = null; - this.unicast = isUnicastByDefault(addListenerMethod); - } /** @@ -229,15 +232,10 @@ } } - this.addListenerMethod = checkRegistrationMethod(listenerType, - addListenerMethod); - this.removeListenerMethod = checkRegistrationMethod(listenerType, - removeListenerMethod); - this.getListenerMethod = checkGetListenerMethod(listenerType, - getListenerMethod); - + this.addListenerMethod = addListenerMethod; + this.removeListenerMethod = removeListenerMethod; + this.getListenerMethod = getListenerMethod; this.unicast = isUnicastByDefault(addListenerMethod); - } /** @@ -257,21 +255,20 @@ this.listenerType = listenerType; - for (int i = 0; i < listenerMethodDescriptors.length; ++i) { - Method listenerMethod = listenerMethodDescriptors[i].getMethod(); + if (listenerMethodDescriptors != null) { + for (int i = 0; i < listenerMethodDescriptors.length; ++i) { + Method listenerMethod = listenerMethodDescriptors[i].getMethod(); - if (checkMethod(listenerType, listenerMethod)) { - this.listenerMethodDescriptors - .add(listenerMethodDescriptors[i]); + if (checkMethod(listenerType, listenerMethod)) { + this.listenerMethodDescriptors + .add(listenerMethodDescriptors[i]); + } } } - this.addListenerMethod = checkRegistrationMethod(listenerType, - addListenerMethod); - this.removeListenerMethod = checkRegistrationMethod(listenerType, - removeListenerMethod); + this.addListenerMethod = addListenerMethod; + this.removeListenerMethod = removeListenerMethod; this.getListenerMethod = null; - this.unicast = isUnicastByDefault(addListenerMethod); }