This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new e2ed94b Fix IDE warnings
e2ed94b is described below
commit e2ed94b7117c4ae12e5154da6f445cd1f8f76621
Author: Mark Thomas <[email protected]>
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 574933f..fa862c5 100644
--- a/java/org/apache/catalina/manager/JMXProxyServlet.java
+++ b/java/org/apache/catalina/manager/JMXProxyServlet.java
@@ -263,10 +263,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;
@@ -277,7 +279,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: [email protected]
For additional commands, e-mail: [email protected]
