Skip to content

Commit

Permalink
Issue #6021 - Simpler resolvePath
Browse files Browse the repository at this point in the history
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
  • Loading branch information
joakime committed Mar 3, 2021
1 parent e34c1cc commit 9de2c20
Showing 1 changed file with 1 addition and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -344,15 +344,7 @@ public static String resolvePath(String baseDir, String destPath)
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
Expand Down

0 comments on commit 9de2c20

Please sign in to comment.