1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

6783290: MBeanInfo/MBeanFeatureInfo has inconsistent readObject/writeObject

Browse Source 
Call readObject in all cases

Reviewed-by: emcmanus
This commit is contained in:
Jaroslav Bachorik 2012-12-20 16:02:42 +04:00 committed by Dmitry Samersoff
parent 059b2b67b3
commit 28979bd7a2
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jdk/src/share/classes/javax/management/MBeanFeatureInfo.java
View File

@ -239,12 +239,10 @@ public class MBeanFeatureInfo implements Serializable, DescriptorRead {
case 1: case 1:
final String[] names = (String[])in.readObject(); final String[] names = (String[])in.readObject();
if (names.length == 0) {
descriptor = ImmutableDescriptor.EMPTY_DESCRIPTOR;
} else {
final Object[] values = (Object[]) in.readObject(); final Object[] values = (Object[]) in.readObject();
descriptor = new ImmutableDescriptor(names, values); descriptor = (names.length == 0) ?
} ImmutableDescriptor.EMPTY_DESCRIPTOR :
new ImmutableDescriptor(names, values);
break; break;
case 0: case 0:

8
jdk/src/share/classes/javax/management/MBeanInfo.java
View File

@ -704,12 +704,10 @@ public class MBeanInfo implements Cloneable, Serializable, DescriptorRead {
case 1: case 1:
final String[] names = (String[])in.readObject(); final String[] names = (String[])in.readObject();
if (names.length == 0) {
descriptor = ImmutableDescriptor.EMPTY_DESCRIPTOR;
} else {
final Object[] values = (Object[]) in.readObject(); final Object[] values = (Object[]) in.readObject();
descriptor = new ImmutableDescriptor(names, values); descriptor = (names.length == 0) ?
} ImmutableDescriptor.EMPTY_DESCRIPTOR :
new ImmutableDescriptor(names, values);
break; break;
case 0: case 0: