This commit is contained in:
RedKale
2016-02-17 09:37:36 +08:00
parent de5d5cde7f
commit 6c98529f66

View File

@@ -51,19 +51,19 @@ public final class HttpPrepareServlet extends PrepareServlet<HttpContext, HttpRe
} }
if (config != null) { if (config != null) {
AnyValue ssConfig = config.getAnyValue("servlets"); AnyValue ssConfig = config.getAnyValue("servlets");
AnyValue resConfig = null;
if (ssConfig != null) { if (ssConfig != null) {
AnyValue resConfig = ssConfig.getAnyValue("resource-servlet"); resConfig = ssConfig.getAnyValue("resource-servlet");
if (resConfig instanceof DefaultAnyValue) { if ((resConfig instanceof DefaultAnyValue) && resConfig.getValue("webroot") == null) {
if (resConfig.getValue("webroot") == null) ((DefaultAnyValue) resConfig).addValue("webroot", config.getValue("root"));
((DefaultAnyValue) resConfig).addValue("webroot", config.getValue("root"));
} }
if (resConfig == null) {
DefaultAnyValue dresConfig = new DefaultAnyValue();
dresConfig.addValue("webroot", config.getValue("root"));
resConfig = dresConfig;
}
this.resourceHttpServlet.init(context, resConfig);
} }
if (resConfig == null) {
DefaultAnyValue dresConfig = new DefaultAnyValue();
dresConfig.addValue("webroot", config.getValue("root"));
resConfig = dresConfig;
}
this.resourceHttpServlet.init(context, resConfig);
} }
} }