svn commit: r1574495 - /tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java

[markt]

Author: markt
Date: Wed Mar  5 14:19:49 2014
New Revision: 1574495

URL: http://svn.apache.org/r1574495
Log:
Findbugs: Remove pointless null check. Refactor.

Modified:
    
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java?rev=1574495&r1=1574494&r2=1574495&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
 Wed Mar  5 14:19:49 2014
@@ -25,6 +25,7 @@ import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.List;
+import java.util.Map.Entry;
 
 import javax.management.ObjectName;
 
@@ -331,11 +332,10 @@ public class MbeansDescriptorsIntrospect
                     mbean.addAttribute(ai);
             }
 
-            en=invokeAttMap.keys();
-            while( en.hasMoreElements() ) {
-                String name = en.nextElement();
-                Method m = invokeAttMap.get(name);
-                if( m!=null && name != null ) {
+            for (Entry<String,Method> entry : invokeAttMap.entrySet()) {
+                String name = entry.getKey();
+                Method m = entry.getValue();
+                if(m != null) {
                     OperationInfo op=new OperationInfo();
                     op.setName(name);
                     op.setReturnType(m.getReturnType().getName());
@@ -350,7 +350,7 @@ public class MbeansDescriptorsIntrospect
                     }
                     mbean.addOperation(op);
                 } else {
-                    log.error("Null arg " + name + " " + m );
+                    log.error("Null arg method for [" + name + "]");
                 }
             }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org