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

[Test] Remove dead code from ExceptionSerializationTests #34713

Merged
merged 2 commits into from
Oct 23, 2018
Merged

[Test] Remove dead code from ExceptionSerializationTests #34713

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d4980a
[Test] Remove dead code from ExceptionSerializationTests
Oct 18, 2018
828ae3e
Merge branch 'master' into tests-removeDeadCode
Oct 23, 2018
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
6 changes: 1 addition & 5 deletions server/src/test/java/org/elasticsearch/ExceptionSerializationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,7 @@ public void testExceptionRegistration()

@Override
public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
Path next = pkgPrefix.resolve(dir.getFileName());
if (ignore.contains(next)) {
return FileVisitResult.SKIP_SUBTREE;
}
pkgPrefix = next;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure it's ok to remove this line ? Line 189 reads it.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My reasoning is this: nothing in this method in this current form changes "next" (the contains() call should have no side effects), so next is still "pkgPrefix.resolve(dir.getFileName())" here, which is what I use to set pkgPrefix in the following line. Does that make sense? I'm not fully sure what the ignore.contains() check was supposed to do at some point, but I think it doesn't do anything now.

pkgPrefix = pkgPrefix.resolve(dir.getFileName());
return FileVisitResult.CONTINUE;
}

Expand Down