Catch Exception to ensure we catch'em'all

carlosdelest · carlosdelest · commit b88fdc4e69dc · 2025-03-27T10:06:39.000+01:00
diff --git a/server/src/main/java/org/elasticsearch/index/analysis/Analysis.java b/server/src/main/java/org/elasticsearch/index/analysis/Analysis.java
@@ -48,7 +48,6 @@
 import org.apache.lucene.analysis.th.ThaiAnalyzer;
 import org.apache.lucene.analysis.tr.TurkishAnalyzer;
 import org.apache.lucene.analysis.util.CSVUtil;
-import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.ResourceNotFoundException;
 import org.elasticsearch.action.support.PlainActionFuture;
 import org.elasticsearch.common.Strings;
@@ -367,15 +366,15 @@ public static Reader getReaderFromIndex(
 
         try {
             results = synonymsLoadingFuture.actionGet();
-        } catch (ElasticsearchException e) {
+        } catch (Exception e) {
             if (ignoreMissing == false) {
                 throw e;
             }
 
             boolean notFound = e instanceof ResourceNotFoundException;
             String message = String.format(
                 Locale.ROOT,
-                "Synonyms set %s %s." + " synonyms will not be applied to search results on indices that use this synonym set",
+                "Synonyms set %s %s. Synonyms will not be applied to search results on indices that use this synonym set",
                 synonymsSet,
                 notFound ? "not found" : "could not be loaded"
             );
