0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #2493 fix npe

Browse source
This commit is contained in:
Shinsuke Sugaya 2020-10-26 22:32:58 +09:00
parent abde5ed1c9
commit 7b21e0a549
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/org/codelibs/fess/FessBoot.java
View file

@ -131,7 +131,13 @@ public class FessBoot extends TomcatBoot {
@Override
protected void setupWebappContext() {
super.setupWebappContext();
final Context context = (Context) server.getHost().findChild(StringUtil.EMPTY);
context.setResources(new FessWebResourceRoot(context));
String contextPath = getContextPath();
if (contextPath.length() > 0 && contextPath.endsWith("/")) {
contextPath = contextPath.replaceAll("/+$", StringUtil.EMPTY);
}
final Context context = (Context) server.getHost().findChild(contextPath);
if (context != null) {
context.setResources(new FessWebResourceRoot(context));
}
}
}