[infinispan-commits] Infinispan SVN: r759 - trunk/core/src/main/java/org/infinispan/notifications.

[infinispan-commits at lists.jboss.org]

Author: mircea.markus
Date: 2009-09-03 05:06:57 -0400 (Thu, 03 Sep 2009)
New Revision: 759

Modified:
   trunk/core/src/main/java/org/infinispan/notifications/AbstractListenerImpl.java
Log:
findbugs: Inefficient use of keySet iterator instead of entrySet iterator
This method accesses the value of a Map entry, using a key that was retrieved from a keySet iterator. It is more efficient to use an iterator on the entrySet of the map, to avoid the Map.get(key) lookup.

Modified: trunk/core/src/main/java/org/infinispan/notifications/AbstractListenerImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/AbstractListenerImpl.java	2009-09-01 18:53:10 UTC (rev 758)
+++ trunk/core/src/main/java/org/infinispan/notifications/AbstractListenerImpl.java	2009-09-03 09:06:57 UTC (rev 759)
@@ -109,10 +109,12 @@
       // now try all methods on the listener for anything that we like.  Note that only PUBLIC methods are scanned.
       for (Method m : listener.getClass().getMethods()) {
          // loop through all valid method annotations
-         for (Class<? extends Annotation> annotation : allowedListeners.keySet()) {
-            if (m.isAnnotationPresent(annotation)) {
-               testListenerMethodValidity(m, allowedListeners.get(annotation), annotation.getName());
-               addListenerInvocation(annotation, new ListenerInvocation(listener, m, sync));
+         for (Map.Entry<Class<? extends Annotation>,Class> annotationEntry : allowedListeners.entrySet()) {
+            Class<? extends Annotation> key = annotationEntry.getKey();
+            Class value = annotationEntry.getValue();
+            if (m.isAnnotationPresent(key)) {
+               testListenerMethodValidity(m, value, key.getName());
+               addListenerInvocation(key, new ListenerInvocation(listener, m, sync));
                foundMethods = true;
             }
          }