HCOLL-156 changed default value object factory from AllocateInstanceObjectFactory to NewInstanceObjectFactory

This commit is contained in:
leventov
2014-10-07 00:52:26 +04:00
parent 1044ee5c03
commit 7d1e4dd2df
2 changed files with 10 additions and 12 deletions
@@ -63,10 +63,10 @@ final class SerializationBuilder<E> implements Cloneable {
this.bufferIdentity = role;
this.eClass = eClass;
ObjectFactory<E> factory = this.factory;
if (factory == null && role == Role.VALUE) {
ObjectFactory<E> factory = null;
if (role == Role.VALUE) {
factory = concreteClass(eClass) && marshallerUseFactory(eClass) ?
new AllocateInstanceObjectFactory(eClass) :
new NewInstanceObjectFactory<E>(eClass) :
NullObjectFactory.INSTANCE;
}
@@ -85,6 +85,9 @@ final class SerializationBuilder<E> implements Cloneable {
if (marshaller != null)
marshaller(marshaller, factory);
}
if (role == Role.VALUE && concreteClass(eClass) && marshallerUseFactory(eClass)) {
factory(factory);
}
}
@SuppressWarnings("unchecked")