Skip to content

Commit b2a56b5

Browse files
committed
Generalise writing of CharSequences
1 parent 186d5a5 commit b2a56b5

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

chronicle/src/main/java/com/higherfrequencytrading/chronicle/impl/AbstractExcerpt.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1757,7 +1757,7 @@ public void write(int b) throws IOException {
17571757
@Override
17581758
public <E> void writeEnum(E e) {
17591759
Class aClass;
1760-
if (e == null)
1760+
if (e == null || e instanceof CharSequence)
17611761
aClass = String.class;
17621762
else
17631763
aClass = (Class) e.getClass();

chronicle/src/main/java/com/higherfrequencytrading/chronicle/impl/StringMarshaller.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
/**
2424
* @author peter.lawrey
2525
*/
26-
public class StringMarshaller implements EnumeratedMarshaller<String> {
26+
public class StringMarshaller implements EnumeratedMarshaller<CharSequence> {
2727
private final int size1;
2828
private String[] interner;
2929

@@ -34,12 +34,12 @@ public StringMarshaller(int size) {
3434
}
3535

3636
@Override
37-
public Class<String> classMarshaled() {
38-
return String.class;
37+
public Class<CharSequence> classMarshaled() {
38+
return CharSequence.class;
3939
}
4040

4141
@Override
42-
public void write(Excerpt excerpt, String s) {
42+
public void write(Excerpt excerpt, CharSequence s) {
4343
excerpt.writeUTF(s);
4444
}
4545

chronicle/src/main/java/com/higherfrequencytrading/chronicle/impl/UnsafeExcerpt.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ public int read(byte[] b, int off, int len) {
241241

242242
static {
243243
try {
244+
244245
@SuppressWarnings("ALL")
245246
Field theUnsafe = Unsafe.class.getDeclaredField("theUnsafe");
246247
theUnsafe.setAccessible(true);

0 commit comments

Comments
 (0)