Skip to content
Permalink
Browse files
Merge branch 'serializable_array_marshalling' into 'ibm-trunk'
Serializable array marshalling

As per the Java2IDL spec, the elements of a Serializable[] need to be marshalled as Anys.

See merge request !24
  • Loading branch information
ngmr committed Mar 31, 2015
2 parents a0f6f6b + 3f2ecf9 commit 82a62e349a155166e145c8a43c7da7209190183f
Showing 1 changed file with 4 additions and 4 deletions.
@@ -158,16 +158,16 @@ static ArrayDescriptor get(final Class type, TypeRepository rep) {
throw new RuntimeException("unknown array type " + type);
}
}
if (java.io.Serializable.class.equals(elemType) ||
java.io.Externalizable.class.equals(elemType) || Object.class.equals(elemType)) {
return new ObjectArrayDescriptor(type, elemType, rep);

if (java.io.Serializable.class.isAssignableFrom(elemType)) {
} else if (java.io.Serializable.class.isAssignableFrom(elemType)) {
return new ValueArrayDescriptor(type, elemType, rep);

} else if (java.rmi.Remote.class.isAssignableFrom(elemType)) {
return new RemoteArrayDescriptor(type, elemType, rep);

} else if (Object.class.equals(elemType)) {
return new ObjectArrayDescriptor(type, elemType, rep);

} else {
return new AbstractObjectArrayDescriptor(type, elemType, rep);
}

0 comments on commit 82a62e3

Please sign in to comment.