Alawn/Chronicle-Map
1
0
Fork 0
mirror of https://github.com/OpenHFT/Chronicle-Map.git synced 2021-09-13 01:26:12 +00:00
Code Releases Activity

Fix a number of tests in Engine

Browse Source
This commit is contained in:
Peter Lawrey
2015-05-20 12:03:10 +01:00
parent aee2af0b70
commit c707518e7c
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/hash/serialization/internal/DataValueBytesMarshallers.java
Regular → Executable
+2
View File
@@ -47,6 +47,8 @@ public final class DataValueBytesMarshallers {
new ConcurrentHashMap<>();
public static <T> BytesReader<T> acquireBytesReader(Class<T> tClass) {
if (tClass == CharSequence.class)
throw new IllegalArgumentException("CharSequence not supported as a Data Value model");
Class readerClass = acquireReaderClass(tClass);
try {
Field instanceField = readerClass.getDeclaredField("INSTANCE");
src/main/java/net/openhft/chronicle/hash/serialization/internal/SerializationBuilder.java
Regular → Executable
+3 -3
View File
@@ -41,9 +41,9 @@ import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.List;
import static net.openhft.chronicle.hash.impl.util.Objects.hash;
import static net.openhft.chronicle.hash.serialization.internal.SizeMarshallers.constant;
import static net.openhft.chronicle.hash.serialization.internal.SizeMarshallers.stopBit;
import static net.openhft.chronicle.hash.impl.util.Objects.hash;
public final class SerializationBuilder<E> implements Cloneable, Serializable {
private static final long serialVersionUID = 0L;
@@ -99,7 +99,7 @@ public final class SerializationBuilder<E> implements Cloneable, Serializable {
private void configureByDefault(Class<E> eClass, Role role) {
instancesAreMutable = instancesAreMutable(eClass);
if (eClass.isInterface()) {
if (eClass.isInterface() && eClass != CharSequence.class) {
try {
BytesReader<E> reader = DataValueBytesMarshallers.acquireBytesReader(eClass);
BytesWriter<E> writer = DataValueBytesMarshallers.acquireBytesWriter(eClass);
@@ -113,7 +113,7 @@ public final class SerializationBuilder<E> implements Cloneable, Serializable {
sizeMarshaller(constant((long) size));
serializesGeneratedClasses = true;
return;
} catch (Exception e) {
} catch (IllegalArgumentException e) {
try {
eClass = DataValueClasses.directClassFor(eClass);
serializesGeneratedClasses = true;