OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-07 09:06:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use different approach for relativize two paths due to Java 11

Browse Source
This commit is contained in:
Wadeck Follonier committed 2018-12-10 10:47:19 +01:00
1 parent ead5dba939
commit 9e8df1aebc
2 files changed
+16 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/main/java/hudson/FilePath.java
+8 -2
View File
@@ -3322,8 +3322,14 @@ public final class FilePath implements Serializable {
while (!remainingPath.isEmpty()) {
Path directChild = this.getDirectChild(currentFilePath, remainingPath);
Path childUsingFullPath = currentFilePath.resolve(remainingPath);
Path rel = directChild.toAbsolutePath().relativize(childUsingFullPath.toAbsolutePath());
remainingPath = rel.toString();
String childUsingFullPathAbs = childUsingFullPath.toAbsolutePath().toString();
String directChildAbs = directChild.toAbsolutePath().toString();
if (childUsingFullPathAbs.length() == directChildAbs.length()) {
remainingPath = "";
} else {
remainingPath = childUsingFullPathAbs.substring(directChildAbs.length() + 1);
}
File childFileSymbolic = Util.resolveSymlinkToFile(directChild.toFile());
if (childFileSymbolic == null) {