Bläddra i källkod

modify upgrade process

Shinsuke Sugaya 8 år sedan
förälder
incheckning
20bc8a42bb

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

@@ -152,6 +152,7 @@ public class AdminUpgradeAction extends FessAdminAction {
         if (VERSION_11_0.equals(form.targetVersion)) {
         if (VERSION_11_0.equals(form.targetVersion)) {
             try {
             try {
                 upgradeFrom11_0();
                 upgradeFrom11_0();
+                upgradeFrom11_1();
                 upgradeFromAll();
                 upgradeFromAll();
 
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -163,7 +164,6 @@ public class AdminUpgradeAction extends FessAdminAction {
             }
             }
         } else if (VERSION_11_1.equals(form.targetVersion)) {
         } else if (VERSION_11_1.equals(form.targetVersion)) {
             try {
             try {
-                upgradeFrom11_0();
                 upgradeFrom11_1();
                 upgradeFrom11_1();
                 upgradeFromAll();
                 upgradeFromAll();
 
 
@@ -266,4 +266,4 @@ public class AdminUpgradeAction extends FessAdminAction {
             }
             }
         });
         });
     }
     }
-}
+}