Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-18612. Avoid mixing canonical and non-canonical when performing comparisons (#5339) 

Contributed by Steve Vaughan Jr
This commit is contained in:
Steve Vaughan 2023-02-06 13:28:29 -05:00 committed by Steve Loughran
parent 10b42e9306
commit 221221d6fb
No known key found for this signature in database
GPG Key ID: D22CF846DBB162A0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
View File

@ -1292,16 +1292,16 @@ public class TestFileUtil {
if (wildcardPath.equals(classPath)) { if (wildcardPath.equals(classPath)) {
// add wildcard matches // add wildcard matches
for (File wildcardMatch: wildcardMatches) { for (File wildcardMatch: wildcardMatches) {
expectedClassPaths.add(wildcardMatch.toURI().toURL() expectedClassPaths.add(wildcardMatch.getCanonicalFile().toURI().toURL()
.toExternalForm()); .toExternalForm());
} }
} else { } else {
File fileCp = null; File fileCp = null;
if(!new Path(classPath).isAbsolute()) { if(!new Path(classPath).isAbsolute()) {
fileCp = new File(tmp, classPath); fileCp = new File(tmp, classPath).getCanonicalFile();
} }
else { else {
fileCp = new File(classPath); fileCp = new File(classPath).getCanonicalFile();
} }
if (nonExistentSubdir.equals(classPath)) { if (nonExistentSubdir.equals(classPath)) {
// expect to maintain trailing path separator if present in input, even // expect to maintain trailing path separator if present in input, even
@ -1356,7 +1356,8 @@ public class TestFileUtil {
for (Path jar: jars) { for (Path jar: jars) {
URL url = jar.toUri().toURL(); URL url = jar.toUri().toURL();
assertTrue("the jar should match either of the jars", assertTrue("the jar should match either of the jars",
url.equals(jar1.toURI().toURL()) || url.equals(jar2.toURI().toURL())); url.equals(jar1.getCanonicalFile().toURI().toURL()) ||
url.equals(jar2.getCanonicalFile().toURI().toURL()));
} }
} }