Browse Source

fix #1250 append / to dictionaryPath

Shinsuke Sugaya 7 years ago
parent
commit
cc5dc0b7b5
1 changed files with 4 additions and 1 deletions
  1. 4 1
      src/main/java/org/codelibs/fess/es/client/FessEsClient.java

+ 4 - 1
src/main/java/org/codelibs/fess/es/client/FessEsClient.java

@@ -396,7 +396,10 @@ public class FessEsClient implements Client {
         final String indexConfigFile = indexConfigPath + "/" + index + ".json";
         try {
             String source = FileUtil.readUTF8(indexConfigFile);
-            final String dictionaryPath = System.getProperty("fess.dictionary.path", StringUtil.EMPTY);
+            String dictionaryPath = System.getProperty("fess.dictionary.path", StringUtil.EMPTY);
+            if (StringUtil.isNotBlank(dictionaryPath) && !dictionaryPath.endsWith("/")) {
+                dictionaryPath = dictionaryPath + "/";
+            }
             source = source.replaceAll(Pattern.quote("${fess.dictionary.path}"), dictionaryPath);
             final CreateIndexResponse indexResponse =
                     client.admin().indices().prepareCreate(indexName).setSource(source, XContentFactory.xContentType(source)).execute()