From 0f00c14afc8428a2a72c0b766d2171029dc8f6e1 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Tue, 15 Mar 2016 21:54:25 -0400 Subject: [PATCH] Remove dead code in FTL#simpleMatchToFullName This commit removes some dead code that resulted from removing the ability for a field to have different names (after enforcing that fields have the same full and index name). Closes #17127 --- .../java/org/elasticsearch/index/mapper/FieldTypeLookup.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/index/mapper/FieldTypeLookup.java b/core/src/main/java/org/elasticsearch/index/mapper/FieldTypeLookup.java index 5e9378e2f55..5f6fddf09ef 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/FieldTypeLookup.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/FieldTypeLookup.java @@ -154,8 +154,6 @@ class FieldTypeLookup implements Iterable { for (MappedFieldType fieldType : this) { if (Regex.simpleMatch(pattern, fieldType.name())) { fields.add(fieldType.name()); - } else if (Regex.simpleMatch(pattern, fieldType.name())) { - fields.add(fieldType.name()); } } return fields;