mirror of
https://github.com/jetty/jetty.project.git
synced 2025-03-04 21:09:13 +00:00
Issue #6021 - Simpler resolvePath
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
parent
e34c1cc312
commit
9de2c2096b
@ -344,15 +344,7 @@ public class XmlConfiguration
|
||||
if (StringUtil.isEmpty(baseDir) || StringUtil.isEmpty(destPath))
|
||||
return null;
|
||||
|
||||
Path base = Paths.get(baseDir);
|
||||
|
||||
if (!Files.exists(base))
|
||||
{
|
||||
// Add warning to debug output
|
||||
LOG.debug("Configured baseDir={} does not exist", baseDir);
|
||||
}
|
||||
|
||||
return base.resolve(destPath).normalize().toString();
|
||||
return Paths.get(baseDir).resolve(destPath).normalize().toString();
|
||||
}
|
||||
|
||||
private static class JettyXmlConfiguration implements ConfigurationProcessor
|
||||
|
Loading…
x
Reference in New Issue
Block a user