From 9de501118605161676c63485db61c21fca0beb4c Mon Sep 17 00:00:00 2001
From: Ben Kazez <ben.kazez@gmail.com>
Date: Sun, 1 Oct 2017 15:47:05 +0100
Subject: [PATCH] Fix Beider-Morse phonetic encoder silent fail when
 languageset not specified #26771 (fix author)

---
 .../index/analysis/PhoneticTokenFilterFactory.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/analysis-phonetic/src/main/java/org/elasticsearch/index/analysis/PhoneticTokenFilterFactory.java b/plugins/analysis-phonetic/src/main/java/org/elasticsearch/index/analysis/PhoneticTokenFilterFactory.java
index ff4ab4943e30f..2b42ed6ecf29a 100644
--- a/plugins/analysis-phonetic/src/main/java/org/elasticsearch/index/analysis/PhoneticTokenFilterFactory.java
+++ b/plugins/analysis-phonetic/src/main/java/org/elasticsearch/index/analysis/PhoneticTokenFilterFactory.java
@@ -116,7 +116,7 @@ public PhoneticTokenFilterFactory(IndexSettings indexSettings, Environment envir
     public TokenStream create(TokenStream tokenStream) {
         if (encoder == null) {
             if (ruletype != null && nametype != null) {
-                if (languageset != null) {
+                if (languageset != null && languageset.length > 0) {
                     final LanguageSet languages = LanguageSet.from(new HashSet<>(Arrays.asList(languageset)));
                     return new BeiderMorseFilter(tokenStream, new PhoneticEngine(nametype, ruletype, true), languages);
                 }