Skip to content

Commit 0215c4c

Browse files
committed
Adjust BWC version on client features
This commit adjusts the BWC version on client features in 6.x to 6.3.0 after the functionality was backported to the 6.3 branch.
1 parent b194568 commit 0215c4c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/ESLoggingHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ else if (readableBytes >= TcpHeader.HEADER_SIZE) {
105105
context.readHeaders(in);
106106
}
107107
// now we decode the features
108-
if (in.getVersion().onOrAfter(Version.V_6_4_0)) {
108+
if (in.getVersion().onOrAfter(Version.V_6_3_0)) {
109109
in.readStringArray();
110110
}
111111
// now we can decode the action name

server/src/main/java/org/elasticsearch/transport/TcpTransport.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1112,7 +1112,7 @@ private void sendRequestToChannel(final DiscoveryNode node, final TcpChannel cha
11121112

11131113
stream.setVersion(version);
11141114
threadPool.getThreadContext().writeTo(stream);
1115-
if (version.onOrAfter(Version.V_6_4_0)) {
1115+
if (version.onOrAfter(Version.V_6_3_0)) {
11161116
stream.writeStringArray(features);
11171117
}
11181118
stream.writeString(action);
@@ -1519,7 +1519,7 @@ protected String handleRequest(TcpChannel channel, String profileName, final Str
15191519
int messageLengthBytes, Version version, InetSocketAddress remoteAddress, byte status)
15201520
throws IOException {
15211521
final Set<String> features;
1522-
if (version.onOrAfter(Version.V_6_4_0)) {
1522+
if (version.onOrAfter(Version.V_6_3_0)) {
15231523
features = Collections.unmodifiableSet(new TreeSet<>(Arrays.asList(stream.readStringArray())));
15241524
} else {
15251525
features = Collections.emptySet();

0 commit comments

Comments
 (0)