Browse Source

fix #770 invoke reloadConfiguration after upgrade process

Shinsuke Sugaya 8 years ago
parent
commit
108028da13

+ 3 - 3
src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java

@@ -172,7 +172,7 @@ public class AdminUpgradeAction extends FessAdminAction {
 
                 saveInfo(messages -> messages.addSuccessUpgradeFrom(GLOBAL));
 
-                fessEsClient.refresh();
+                systemHelper.reloadConfiguration();
             } catch (final Exception e) {
                 logger.warn("Failed to upgrade data.", e);
                 saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_10_1, e.getLocalizedMessage()));
@@ -185,7 +185,7 @@ public class AdminUpgradeAction extends FessAdminAction {
 
                 saveInfo(messages -> messages.addSuccessUpgradeFrom(GLOBAL));
 
-                fessEsClient.refresh();
+                systemHelper.reloadConfiguration();
             } catch (final Exception e) {
                 logger.warn("Failed to upgrade data.", e);
                 saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_10_1, e.getLocalizedMessage()));
@@ -199,7 +199,7 @@ public class AdminUpgradeAction extends FessAdminAction {
 
                 saveInfo(messages -> messages.addSuccessUpgradeFrom(GLOBAL));
 
-                fessEsClient.refresh();
+                systemHelper.reloadConfiguration();
             } catch (final Exception e) {
                 logger.warn("Failed to upgrade data.", e);
                 saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_10_0, e.getLocalizedMessage()));

+ 1 - 0
src/main/java/org/codelibs/fess/helper/SystemHelper.java

@@ -299,6 +299,7 @@ public class SystemHelper {
     }
 
     public void reloadConfiguration() {
+        ComponentUtil.getFessEsClient().refresh();
         ComponentUtil.getLabelTypeHelper().init();
         ComponentUtil.getPathMappingHelper().init();
         ComponentUtil.getSuggestHelper().init();