Skip to content

Commit 4decde7

Browse files
committed
a better trapping when adding servlets
1 parent e23022a commit 4decde7

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

logicaldoc-util/src/main/java/com/logicaldoc/util/plugin/LogicalDOCPlugin.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -307,9 +307,16 @@ protected void addServlet(String name, String servletClass, String mapping) {
307307
*/
308308
protected void addServlet(String name, String servletClass, String mapping, Integer loadOnStartup) {
309309
try {
310-
File dest = new File(getPluginPath());
311-
dest = dest.getParentFile().getParentFile();
312-
WebConfigurator config = new WebConfigurator(dest.getPath() + "/web.xml");
310+
File webDescriptor = new File(getPluginPath());
311+
webDescriptor = webDescriptor.getParentFile().getParentFile();
312+
webDescriptor = new File(webDescriptor, "web.xml");
313+
if (!webDescriptor.exists()) {
314+
logger.warn("Cannot add servlet {} because no web descriptor located at {}", name,
315+
webDescriptor.getAbsolutePath());
316+
return;
317+
}
318+
319+
WebConfigurator config = new WebConfigurator(webDescriptor.getAbsolutePath());
313320
if (loadOnStartup != null)
314321
config.addServlet(name, servletClass, loadOnStartup);
315322
else

0 commit comments

Comments
 (0)