You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2007/11/24 12:21:13 UTC
svn commit: r597839 -
/mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/DefaultModelMBean.java
Author: trustin
Date: Sat Nov 24 03:21:13 2007
New Revision: 597839
URL: http://svn.apache.org/viewvc?rev=597839&view=rev
Log:
Fixed an issue with operations that returns void.
Modified:
mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/DefaultModelMBean.java
Modified: mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/DefaultModelMBean.java
URL: http://svn.apache.org/viewvc/mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/DefaultModelMBean.java?rev=597839&r1=597838&r2=597839&view=diff
==============================================================================
--- mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/DefaultModelMBean.java (original)
+++ mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/DefaultModelMBean.java Sat Nov 24 03:21:13 2007
@@ -510,8 +510,7 @@
operations.add(new ModelMBeanOperationInfo(
m.getName(), m.getName(),
signature.toArray(new MBeanParameterInfo[signature.size()]),
- convertOperationReturnType(
- m.getName(), m.getReturnType()).getName(),
+ convertOperationReturnType(m.getReturnType()).getName(),
ModelMBeanOperationInfo.ACTION));
}
@@ -563,12 +562,14 @@
}
}
- private Class<?> convertOperationReturnType(
- String opName, Class<?> opReturnType) {
-
+ private Class<?> convertOperationReturnType(Class<?> opReturnType) {
if (IoFuture.class.isAssignableFrom(opReturnType)) {
return void.class;
}
+ if (opReturnType == void.class || opReturnType == Void.class) {
+ return void.class;
+ }
+
return convertAttributeType("", opReturnType);
}