Break iteration when method is found (#10128)

diff --git a/server/src/main/java/com/vaadin/event/EventRouter.java b/server/src/main/java/com/vaadin/event/EventRouter.java
index 59599a0aac20526c02924be78aa572b4a9b28895..a6bb030cf81711d06388b127e7f23012a24e7a1b 100644 (file)
--- a/server/src/main/java/com/vaadin/event/EventRouter.java
+++ b/server/src/main/java/com/vaadin/event/EventRouter.java
@@ -135,6 +135,7 @@ public class EventRouter implements MethodEventSource {
         for (Method m : methods) {
             if (m.getName().equals(methodName)) {
                 method = m;
+                break;
             }
         }
         if (method == null) {
@@ -152,7 +153,6 @@ public class EventRouter implements MethodEventSource {
                 }
             }
         }
-
     }
 
     /**
@@ -209,7 +209,6 @@ public class EventRouter implements MethodEventSource {
                     listenerMethod.receiveEvent(event);
                 }
             }
-
         }
     }
 

diff --git a/server/src/main/java/com/vaadin/event/ListenerMethod.java b/server/src/main/java/com/vaadin/event/ListenerMethod.java
index 9159f7f78198669fed8b6c7271595b307de419b6..8391303c8942bfcdd890953f62eb430281a83ae5 100644 (file)
--- a/server/src/main/java/com/vaadin/event/ListenerMethod.java
+++ b/server/src/main/java/com/vaadin/event/ListenerMethod.java
@@ -243,10 +243,10 @@ public class ListenerMethod implements EventListener, Serializable {
             throws IllegalArgumentException {
 
         // Finds the correct method
-        Method method = null;
         for (Method m : target.getClass().getMethods()) {
             if (m.getName().equals(methodName)) {
                 method = m;
+                break;
             }
         }
         if (method == null) {
@@ -271,7 +271,6 @@ public class ListenerMethod implements EventListener, Serializable {
 
         this.eventType = eventType;
         this.target = target;
-        this.method = method;
         this.arguments = arguments;
         this.eventArgumentIndex = eventArgumentIndex;
     }
@@ -355,6 +354,7 @@ public class ListenerMethod implements EventListener, Serializable {
         for (Method m : target.getClass().getMethods()) {
             if (m.getName().equals(methodName)) {
                 method = m;
+                break;
             }
         }
         if (method == null) {
@@ -364,7 +364,6 @@ public class ListenerMethod implements EventListener, Serializable {
 
         this.eventType = eventType;
         this.target = target;
-        this.method = method;
         this.arguments = arguments;
         eventArgumentIndex = -1;
     }
@@ -451,10 +450,10 @@ public class ListenerMethod implements EventListener, Serializable {
             throws IllegalArgumentException {
 
         // Finds the correct method
-        Method method = null;
         for (Method m : target.getClass().getMethods()) {
             if (m.getName().equals(methodName)) {
                 method = m;
+                break;
             }
         }
         if (method == null) {
@@ -464,7 +463,6 @@ public class ListenerMethod implements EventListener, Serializable {
 
         this.eventType = eventType;
         this.target = target;
-        this.method = method;
         eventArgumentIndex = -1;
 
         final Class<?>[] params = method.getParameterTypes();