Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Feb 6, 2023
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa1cf3b
HADOOP-18612. Avoid mixing canonical and non-canonical when performin…
Mar 22, 2022
103acf9
Wrap line longer than 100 characters
Feb 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1321,16 +1321,16 @@ public void testCreateJarWithClassPath() throws Exception {
if (wildcardPath.equals(classPath)) {
// add wildcard matches
for (File wildcardMatch: wildcardMatches) {
expectedClassPaths.add(wildcardMatch.toURI().toURL()
expectedClassPaths.add(wildcardMatch.getCanonicalFile().toURI().toURL()
.toExternalForm());
}
} else {
File fileCp = null;
if(!new Path(classPath).isAbsolute()) {
fileCp = new File(tmp, classPath);
fileCp = new File(tmp, classPath).getCanonicalFile();
}
else {
fileCp = new File(classPath);
fileCp = new File(classPath).getCanonicalFile();
}
if (nonExistentSubdir.equals(classPath)) {
// expect to maintain trailing path separator if present in input, even
Expand Down Expand Up @@ -1385,7 +1385,8 @@ public void testGetJarsInDirectory() throws Exception {
for (Path jar: jars) {
URL url = jar.toUri().toURL();
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()));
}
}

Expand Down