Skip to content

Fix off-by-one error in TransportVersionUtils.getNextVersion #93775

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

Merged
merged 3 commits into from
Feb 14, 2023
Merged

Fix off-by-one error in TransportVersionUtils.getNextVersion #93775

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f11e2e5
Fix TransportVersionUtils.getNextVersion
thecoop Feb 14, 2023
5d785d4
Add check the other side
thecoop Feb 14, 2023
5c9ccd4
Update bounds
thecoop Feb 14, 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
11 changes: 8 additions & 3 deletions test/framework/src/main/java/org/elasticsearch/test/TransportVersionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ public static TransportVersion getPreviousVersion(TransportVersion version) {
// version does not exist - need the item before the index this version should be inserted
place = -(place + 1);
}
if (place <= 1) {

if (place < 1) {
throw new IllegalArgumentException("couldn't find any released versions before [" + version + "]");
}
return ALL_VERSIONS.get(place - 1);
Expand All @@ -97,11 +98,15 @@ public static TransportVersion getNextVersion(TransportVersion version) {
if (place < 0) {
// version does not exist - need the item at the index this version should be inserted
place = -(place + 1);
} else {
// need the *next* version
place++;
}
if (place <= 1) {

if (place < 0 || place >= ALL_VERSIONS.size()) {
throw new IllegalArgumentException("couldn't find any released versions after [" + version + "]");
}
return ALL_VERSIONS.get(place + 1);
return ALL_VERSIONS.get(place);
}

/** Returns a random {@link Version} from all available versions, that is compatible with the given version. */
Expand Down