From 2b89375a2fe9f84aaf4e86b1c5821cbcdbadbe88 Mon Sep 17 00:00:00 2001 From: idk Date: Tue, 4 Apr 2023 20:39:59 +0000 Subject: [PATCH] don't re-use prop name --- .../src/net/i2p/router/web/helpers/JettyMigrationHelper.java | 4 ++-- apps/routerconsole/jsp/index.jsp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/JettyMigrationHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/JettyMigrationHelper.java index b0336bc577..cf93d97373 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/JettyMigrationHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/JettyMigrationHelper.java @@ -3,8 +3,8 @@ import net.i2p.router.web.HelperBase; public class JettyMigrationHelper extends HelperBase{ - public static final String PROP_COMPLETE = "routerconsole.jettyMigrationComplete"; + public static final String PROP_NEEDS_JETTY_MIGRATION = "routerconsole.jettyMigrationComplete"; public void complete() { - _context.router().saveConfig(PROP_COMPLETE, "true"); + _context.router().saveConfig(PROP_NEEDS_JETTY_MIGRATION, "true"); } } diff --git a/apps/routerconsole/jsp/index.jsp b/apps/routerconsole/jsp/index.jsp index ad3c9abc86..db733b77b6 100644 --- a/apps/routerconsole/jsp/index.jsp +++ b/apps/routerconsole/jsp/index.jsp @@ -25,6 +25,7 @@ net.i2p.I2PAppContext ctx = net.i2p.I2PAppContext.getGlobalContext(); boolean oldHome = ctx.getBooleanProperty("routerconsole.oldHomePage"); boolean wizRun = ctx.getBooleanProperty(net.i2p.router.web.helpers.WizardHelper.PROP_COMPLETE); + boolean needsJettyMigration = ctx.getBooleanProperty(net.i2p.router.web.helpers.JettyMigrationHelper.PROP_NEEDS_JETTY_MIGRATION); String firstVersion = ctx.getProperty("router.firstVersion"); String tgt; final boolean ENABLE_WIZARD_ON_FIRST_RUN = true;