Added a shared Java constant for setting key server.servlets.called

pull/137/head
luccioman 7 years ago
parent 033f7c4c00
commit 2fd4d05e2f

@ -65,7 +65,7 @@ public class Status
// check if the basic configuration was accessed before and forward
prop.put("forwardToConfigBasic", 0);
if ((post == null || !post.containsKey("noforward")) && sb.getConfig("server.servlets.called", "").indexOf("ConfigBasic.html", 0) < 0) {
if ((post == null || !post.containsKey("noforward")) && sb.getConfig(SwitchboardConstants.SERVER_SERVLETS_CALLED, "").indexOf("ConfigBasic.html", 0) < 0) {
// forward to ConfigBasic
prop.put("forwardToConfigBasic", 1);
}

@ -1031,7 +1031,7 @@ public class YaCyDefaultServlet extends HttpServlet {
if (targetFile.exists() && targetFile.isFile() && targetFile.canRead()) {
sb.setConfig("server.servlets.called", appendPath(sb.getConfig("server.servlets.called", ""), target));
sb.setConfig(SwitchboardConstants.SERVER_SERVLETS_CALLED, appendPath(sb.getConfig(SwitchboardConstants.SERVER_SERVLETS_CALLED, ""), target));
if (args != null && !args.isEmpty()) {
sb.setConfig("server.servlets.submitted", appendPath(sb.getConfig("server.servlets.submitted", ""), target));
}

@ -458,6 +458,9 @@ public final class SwitchboardConstants {
*/
public static final String WORK_PATH = "workPath";
public static final String WORK_PATH_DEFAULT = "DATA/WORK";
/** Setting key of the property that collects the names of all servlets that have been used so far. */
public static final String SERVER_SERVLETS_CALLED = "server.servlets.called";
/*

Loading…
Cancel
Save