Merged gcj-eclipse branch to trunk.

From-SVN: r120621

1 files changed, 11 insertions, 2 deletions

diff --git a/libjava/classpath/javax/management/MBeanAttributeInfo.java b/libjava/classpath/javax/management/MBeanAttributeInfo.java
index bded7e4..2d7c100 100644
--- a/libjava/classpath/javax/management/MBeanAttributeInfo.java
+++ b/libjava/classpath/javax/management/MBeanAttributeInfo.java
@@ -38,6 +38,7 @@ exception statement from your version. */
 package javax.management;
 
 import java.lang.reflect.Method;
+import java.lang.reflect.Type;
 
 /**
  * Describes the attributes of a management bean.
@@ -109,13 +110,21 @@ public class MBeanAttributeInfo
 				       "not be null.");
     if (getter == null)
       {
-	attributeType = setter.getParameterTypes()[0].getName();
+	Type t = setter.getGenericParameterTypes()[0];
+	if (t instanceof Class)
+	  attributeType = ((Class) t).getName();
+	else
+	  attributeType = t.toString();
 	isRead = false;
 	is = false;
       }
     else
       {
-	attributeType = getter.getReturnType().getName();
+	Type t = getter.getGenericReturnType();
+	if (t instanceof Class)
+	  attributeType = ((Class) t).getName();
+	else
+	  attributeType = t.toString();
 	isRead = true;
 	is = getter.getName().startsWith("is");
       }