Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-05 13:29:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue #6021 - Simpler resolvePath

Browse Source 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Joakim Erdfelt 2021-03-03 08:29:18 -06:00
parent e34c1cc312
commit 9de2c2096b
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
View File

@ -344,15 +344,7 @@ public class XmlConfiguration
if (StringUtil.isEmpty(baseDir) || StringUtil.isEmpty(destPath)) if (StringUtil.isEmpty(baseDir) || StringUtil.isEmpty(destPath))
return null; return null;
Path base = Paths.get(baseDir); return Paths.get(baseDir).resolve(destPath).normalize().toString();
if (!Files.exists(base))
{
// Add warning to debug output
LOG.debug("Configured baseDir={} does not exist", baseDir);
}
return base.resolve(destPath).normalize().toString();
} }
private static class JettyXmlConfiguration implements ConfigurationProcessor private static class JettyXmlConfiguration implements ConfigurationProcessor