2006-10-14 Edwin Steiner <edwin.steiner@gmx.net>

	PR classpath/28652:
	* javax/management/MBeanInfo.java (MBeanInfo):
	Use clone to duplicate the arrays in order to
	preserve the array type.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@122050 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 577fa67..2288788 100644 (file)
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-14  Edwin Steiner  <edwin.steiner@gmx.net>
+
+       PR classpath/28652:
+       * javax/management/MBeanInfo.java (MBeanInfo): 
+       Use clone to duplicate the arrays in order to
+       preserve the array type.
+
 2007-02-16  Andrew Haley  <aph@redhat.com>
 
        * gnu/java/lang/management/MemoryMXBeanImpl.java,

diff --git a/libjava/classpath/javax/management/MBeanInfo.java b/libjava/classpath/javax/management/MBeanInfo.java
index d30de04..64e627f 100644 (file)
--- a/libjava/classpath/javax/management/MBeanInfo.java
+++ b/libjava/classpath/javax/management/MBeanInfo.java
@@ -160,34 +160,26 @@ public class MBeanInfo
   {
     className = name;
     description = desc;
+
     if (attribs == null)
       attributes = new MBeanAttributeInfo[0];
     else
-      {
-       attributes = new MBeanAttributeInfo[attribs.length];
-       System.arraycopy(attribs, 0, attributes, 0, attribs.length);
-      }
+      attributes = (MBeanAttributeInfo[]) attribs.clone();
+
     if (cons == null)
       constructors = new MBeanConstructorInfo[0];
     else
-      {
-       constructors = new MBeanConstructorInfo[cons.length];
-       System.arraycopy(cons, 0, constructors, 0, cons.length);
-      }
+      constructors = (MBeanConstructorInfo[]) cons.clone();
+
     if (ops == null)
       operations = new MBeanOperationInfo[0];
     else
-      {
-       operations = new MBeanOperationInfo[ops.length];
-       System.arraycopy(ops, 0, operations, 0, ops.length);
-      }
+      operations = (MBeanOperationInfo[]) ops.clone();
+
     if (notifs == null)
       notifications = new MBeanNotificationInfo[0];
     else
-      {
-       notifications = new MBeanNotificationInfo[notifs.length];
-       System.arraycopy(notifs, 0, notifications, 0, notifs.length);
-      }
+      notifications = (MBeanNotificationInfo[]) notifs.clone();
   }
 
   /**

diff --git a/libjava/classpath/lib/javax/management/MBeanInfo.class b/libjava/classpath/lib/javax/management/MBeanInfo.class
index 9af2932..956226e 100644 (file)
Binary files a/libjava/classpath/lib/javax/management/MBeanInfo.class and b/libjava/classpath/lib/javax/management/MBeanInfo.class differ