Update Chronicle-Values dependency and try to check if some interface is a valueInterface before attempting to generate implementations

This commit is contained in:
leventov
2016-03-12 21:33:23 +07:00
parent 27d781c08d
commit e081cb87ba
3 changed files with 8 additions and 3 deletions
@@ -55,7 +55,7 @@ public final class SerializationBuilder<T> implements Cloneable {
@SuppressWarnings("unchecked")
private void configureByDefault(Class<T> tClass) {
if (tClass.isInterface()) {
if (tClass.isInterface() && Values.isValueInterfaceOrImplClass(tClass)) {
try {
// Acquire a model before assigning readers/writers
// if the interface is not
@@ -37,6 +37,7 @@ import net.openhft.chronicle.map.replication.MapRemoteOperations;
import net.openhft.chronicle.set.ChronicleSetBuilder;
import net.openhft.chronicle.threads.NamedThreadFactory;
import net.openhft.chronicle.values.ValueModel;
import net.openhft.chronicle.values.Values;
import net.openhft.chronicle.wire.TextWire;
import net.openhft.chronicle.wire.Wire;
import org.jetbrains.annotations.NotNull;
@@ -787,7 +788,11 @@ public final class ChronicleMapBuilder<K, V> implements
if (alignment != UNDEFINED_ALIGNMENT_CONFIG)
return alignment;
try {
return ValueModel.acquire(valueBuilder.tClass).recommendedOffsetAlignment();
if (Values.isValueInterfaceOrImplClass(valueBuilder.tClass)) {
return ValueModel.acquire(valueBuilder.tClass).recommendedOffsetAlignment();
} else {
return NO_ALIGNMENT;
}
} catch (Exception e) {
return NO_ALIGNMENT;
}