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

HCOLL-302 fixed bug around heapSizeOrderedFieldsGrouped

Browse Source 
Conflicts:
	src/main/java/net/openhft/chronicle/hash/serialization/internal/DataValueBytesMarshallers.java
This commit is contained in:
Rob Austin
2015-07-25 17:56:54 +03:00
committed by leventov
parent da3e104974
commit df84845fc2
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/hash/serialization/internal/DataValueBytesMarshallers.java
+7 -9
View File
@@ -192,8 +192,6 @@ public final class DataValueBytesMarshallers {
return sb.toString();
}
private static String bytesReaderName(Class type, boolean simple) {
return (simple ? type.getSimpleName() : type.getName()) + "$$BytesReader";
}
@@ -379,16 +377,16 @@ public final class DataValueBytesMarshallers {
sb.append(" if (e instanceof Byteable) {\n");
sb.append(
" Bytes eBytes = ((Byteable) e).bytes();\n" +
" if (eBytes != null) {\n" +
" bytes.write(eBytes, ((Byteable) e).offset(), " +
" if (eBytes != null) {\n" +
" bytes.write(eBytes, ((Byteable) e).offset(), " +
size + ");\n" +
" } else {\n" +
" throw new NullPointerException(" +
" } else {\n" +
" throw new NullPointerException(" +
"\"You are trying to write a byteable object of \" +\n" +
" e.getClass() + \", \" +\n" +
" \"which bytes are not assigned. I. e. most likely " +
" e.getClass() + \", \" +\n" +
" \"which bytes are not assigned. I. e. most likely " +
"the object is uninitialized.\");\n" +
" }\n");
" }\n");
sb.append(" return;\n");
sb.append(" }\n");
}