svn commit: r1849240 - in /tomcat/trunk/java/org/apache/tomcat/util/modeler: LocalStrings.properties LocalStrings_fr.properties LocalStrings_ko.properties LocalStrings_zh_CN.properties modules/MbeansDescriptorsIntrospectionSource.java

[markt]

Author: markt
Date: Tue Dec 18 21:29:16 2018
New Revision: 1849240

URL: http://svn.apache.org/viewvc?rev=1849240&view=rev
Log:
Remove some unreachable code.

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings.properties
    tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_fr.properties
    tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_ko.properties
    
tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_zh_CN.properties
    
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings.properties?rev=1849240&r1=1849239&r2=1849240&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings.properties 
Tue Dec 18 21:29:16 2018
@@ -35,7 +35,6 @@ managedMBean.noOperation=Cannot find ope
 managedMBean.noSet=Cannot find setter method [{0}] on resource [{1}]
 
 modules.digesterParseError=Error parsing registry data
-modules.nullMethod=No method argument for [{0}]
 modules.readDescriptorsError=Error reading descriptors
 
 registry.initError=Error initializing [{0}]

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_fr.properties?rev=1849240&r1=1849239&r2=1849240&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_fr.properties 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_fr.properties 
Tue Dec 18 21:29:16 2018
@@ -35,7 +35,6 @@ managedMBean.noOperation=Impossible de t
 managedMBean.noSet=Impossible de trouver la méthode de modification [{0}] sur 
la ressource [{1}]
 
 modules.digesterParseError=Erreur lors de l'analyse des données du registre
-modules.nullMethod=Pas d''argument méthode pour [{0}]
 modules.readDescriptorsError=Erreur lors de la lecture des descripteurs
 
 registry.initError=Erreur lors de l''initialisation [{0}]

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_ko.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_ko.properties?rev=1849240&r1=1849239&r2=1849240&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_ko.properties 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_ko.properties 
Tue Dec 18 21:29:16 2018
@@ -35,7 +35,6 @@ managedMBean.noOperation=오퍼ë�
 managedMBean.noSet=리소스 [{1}]에서 setter 메소드 [{0}]을(를) 찾을 
수 없습니다.
 
 modules.digesterParseError=레지스트리의 데이터를 파싱하는 중 
오류 발생
-modules.nullMethod=[{0}]을(를) 위한 메소드 아규먼트가 없습니다.
 modules.readDescriptorsError=Descriptor들을 읽는 중 오류 발생
 
 registry.initError=[{0}]을(를) 초기화하는 중 오류 발생

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_zh_CN.properties?rev=1849240&r1=1849239&r2=1849240&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_zh_CN.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_zh_CN.properties 
Tue Dec 18 21:29:16 2018
@@ -15,7 +15,6 @@
 
 baseModelMBean.nullListener=监听器为空
 
-modules.nullMethod=[{0}] 没有方法参数
 modules.readDescriptorsError=读取描述文件出错
 
 registry.registerError=注册 MBean 出错

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=1849240&r1=1849239&r2=1849240&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
 Tue Dec 18 21:29:16 2018
@@ -333,26 +333,26 @@ public class MbeansDescriptorsIntrospect
                     mbean.addAttribute(ai);
             }
 
+            // This map is populated by iterating the methods (which end up as
+            // values in the Map) and obtaining the key from the value. It is
+            // impossible for a key to be associated with a null value.
             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());
-                    op.setDescription("Introspected operation " + name);
-                    Class<?> parms[] = m.getParameterTypes();
-                    for(int i=0; i<parms.length; i++ ) {
-                        ParameterInfo pi=new ParameterInfo();
-                        pi.setType(parms[i].getName());
-                        pi.setName( "param" + i);
-                        pi.setDescription("Introspected parameter param" + i);
-                        op.addParameter(pi);
-                    }
-                    mbean.addOperation(op);
-                } else {
-                    log.error(sm.getString("modules.nullMethod", name));
+
+                OperationInfo op=new OperationInfo();
+                op.setName(name);
+                op.setReturnType(m.getReturnType().getName());
+                op.setDescription("Introspected operation " + name);
+                Class<?> parms[] = m.getParameterTypes();
+                for(int i=0; i<parms.length; i++ ) {
+                    ParameterInfo pi=new ParameterInfo();
+                    pi.setType(parms[i].getName());
+                    pi.setName( "param" + i);
+                    pi.setDescription("Introspected parameter param" + i);
+                    op.addParameter(pi);
                 }
+                mbean.addOperation(op);
             }
 
             if( log.isDebugEnabled())



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