Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #6021 - Addressing naming 

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

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

@ -28,7 +28,6 @@ import java.net.InetAddress;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.UnknownHostException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.security.AccessController;
@ -333,18 +332,19 @@ public class XmlConfiguration
}
/**
* Utility method to resolve a provided path against a base directory.
* Utility method to resolve a provided path against a directory.
*
* @param baseDir the base directory
* @param destPath the destination path (can be relative or absolute, syntax depends on OS + FileSystem in use)
* @param dir the directory (should be a directory reference, does not have to exist)
* @param destPath the destination path (can be relative or absolute, syntax depends on OS + FileSystem in use,
* and does not need to exist)
* @return String to resolved and normalized path, or null if baseDir or destPath is empty.
*/
public static String resolvePath(String baseDir, String destPath)
public static String resolvePath(String dir, String destPath)
{
if (StringUtil.isEmpty(baseDir) || StringUtil.isEmpty(destPath))
if (StringUtil.isEmpty(dir) || StringUtil.isEmpty(destPath))
return null;
return Paths.get(baseDir).resolve(destPath).normalize().toString();
return Paths.get(dir).resolve(destPath).normalize().toString();
}
private static class JettyXmlConfiguration implements ConfigurationProcessor