From 73783e16693119288e12750a0aaa43fec17fcf2a Mon Sep 17 00:00:00 2001 From: kimchy Date: Mon, 17 Jan 2011 12:50:16 +0200 Subject: [PATCH] protect against a case when string field data value is null --- .../index/field/data/strings/StringFieldData.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/StringFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/StringFieldData.java index e2b98dec72289..0e236483fe43b 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/StringFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/StringFieldData.java @@ -43,7 +43,9 @@ protected StringFieldData(String fieldName, String[] values) { @Override protected long computeSizeInBytes() { long size = RamUsage.NUM_BYTES_ARRAY_HEADER; for (String value : values) { - size += RamUsage.NUM_BYTES_OBJECT_HEADER + value.length() * RamUsage.NUM_BYTES_CHAR + (3 * RamUsage.NUM_BYTES_INT); + if (value != null) { + size += RamUsage.NUM_BYTES_OBJECT_HEADER + value.length() * RamUsage.NUM_BYTES_CHAR + (3 * RamUsage.NUM_BYTES_INT); + } } return size; }