Skip to content

Commit bfc7355

Browse files
authored
Some fixes for toReleaseVersion change #112242 from the backport #112280 (#112284)
1 parent e379c4f commit bfc7355

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

server/src/main/java/org/elasticsearch/ReleaseVersions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public static IntFunction<String> generateVersionsLookup(Class<?> versionContain
5353

5454
NavigableMap<Integer, List<Version>> versions = new TreeMap<>();
5555
// add the current version id, which won't be in the csv
56-
versions.put(current, List.of(Version.CURRENT));
56+
versions.computeIfAbsent(current, k -> new ArrayList<>()).add(Version.CURRENT);
5757

5858
try (BufferedReader reader = new BufferedReader(new InputStreamReader(versionsFile, StandardCharsets.UTF_8))) {
5959
String line;

server/src/test/java/org/elasticsearch/TransportVersionTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.util.regex.Pattern;
2020

2121
import static org.hamcrest.Matchers.containsString;
22+
import static org.hamcrest.Matchers.endsWith;
2223
import static org.hamcrest.Matchers.equalTo;
2324
import static org.hamcrest.Matchers.greaterThan;
2425
import static org.hamcrest.Matchers.is;
@@ -187,7 +188,7 @@ public void testCURRENTIsLatest() {
187188
}
188189

189190
public void testToReleaseVersion() {
190-
assertThat(TransportVersion.current().toReleaseVersion(), equalTo(Version.CURRENT.toString()));
191+
assertThat(TransportVersion.current().toReleaseVersion(), endsWith(Version.CURRENT.toString()));
191192
}
192193

193194
public void testToString() {

0 commit comments

Comments
 (0)