[tomcat] branch 8.5.x updated: Fix IDE warnings

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
     new aa0881c  Fix IDE warnings
aa0881c is described below

commit aa0881cd9eb965b80603f566cc31eb2041dade95
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jan 14 21:04:15 2020 +0000

    Fix IDE warnings
---
 java/org/apache/catalina/manager/JMXProxyServlet.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/manager/JMXProxyServlet.java 
b/java/org/apache/catalina/manager/JMXProxyServlet.java
index 7333e26..d6eeb70 100644
--- a/java/org/apache/catalina/manager/JMXProxyServlet.java
+++ b/java/org/apache/catalina/manager/JMXProxyServlet.java
@@ -262,10 +262,12 @@ public class JMXProxyServlet extends HttpServlet {
      *            call the requested operation.
      * @return The value returned by the requested operation.
      */
+    @SuppressWarnings("null") // parameters can't be null if signature.length 
> 0
     private Object invokeOperationInternal(String onameStr, String operation, 
String[] parameters)
             throws OperationsException, MBeanException, ReflectionException {
         ObjectName oname = new ObjectName(onameStr);
-        MBeanOperationInfo methodInfo = registry.getMethodInfo(oname, 
operation, (null == parameters ? 0 : parameters.length));
+        int paramCount = null == parameters ? 0 : parameters.length;
+        MBeanOperationInfo methodInfo = registry.getMethodInfo(oname, 
operation, paramCount);
         if(null == methodInfo) {
             // getMethodInfo returns null for both "object not found" and 
"operation not found"
             MBeanInfo info = null;
@@ -276,7 +278,9 @@ public class JMXProxyServlet extends HttpServlet {
             } catch (Exception e) {
                 throw new 
IllegalArgumentException(sm.getString("jmxProxyServlet.noBeanFound", onameStr), 
e);
             }
-            throw new 
IllegalArgumentException(sm.getString("jmxProxyServlet.noOperationOnBean", 
operation, (null == parameters ? 0 : parameters.length), onameStr, 
info.getClassName()));
+            throw new IllegalArgumentException(
+                    sm.getString("jmxProxyServlet.noOperationOnBean",
+                            operation, Integer.valueOf(paramCount), onameStr, 
info.getClassName()));
         }
 
         MBeanParameterInfo[] signature = methodInfo.getSignature();


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