Skip to content

Commit 73783e1

Browse files
committed
protect against a case when string field data value is null
1 parent dfddde3 commit 73783e1

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/StringFieldData.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ protected StringFieldData(String fieldName, String[] values) {
4343
@Override protected long computeSizeInBytes() {
4444
long size = RamUsage.NUM_BYTES_ARRAY_HEADER;
4545
for (String value : values) {
46-
size += RamUsage.NUM_BYTES_OBJECT_HEADER + value.length() * RamUsage.NUM_BYTES_CHAR + (3 * RamUsage.NUM_BYTES_INT);
46+
if (value != null) {
47+
size += RamUsage.NUM_BYTES_OBJECT_HEADER + value.length() * RamUsage.NUM_BYTES_CHAR + (3 * RamUsage.NUM_BYTES_INT);
48+
}
4749
}
4850
return size;
4951
}

0 commit comments

Comments
 (0)