Skip to content

Commit 3670a2a

Browse files
committed
Adjust BWC version on client features
This commit adjusts the BWC version on client features in master to 6.3.0 after the functionality was backported to the 6.3 branch.
1 parent f8785dd commit 3670a2a

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
@@ -1121,7 +1121,7 @@ private void sendRequestToChannel(final DiscoveryNode node, final TcpChannel cha
11211121

11221122
stream.setVersion(version);
11231123
threadPool.getThreadContext().writeTo(stream);
1124-
if (version.onOrAfter(Version.V_6_4_0)) {
1124+
if (version.onOrAfter(Version.V_6_3_0)) {
11251125
stream.writeStringArray(features);
11261126
}
11271127
stream.writeString(action);
@@ -1589,7 +1589,7 @@ protected String handleRequest(TcpChannel channel, String profileName, final Str
15891589
int messageLengthBytes, Version version, InetSocketAddress remoteAddress, byte status)
15901590
throws IOException {
15911591
final Set<String> features;
1592-
if (version.onOrAfter(Version.V_6_4_0)) {
1592+
if (version.onOrAfter(Version.V_6_3_0)) {
15931593
features = Collections.unmodifiableSet(new TreeSet<>(Arrays.asList(stream.readStringArray())));
15941594
} else {
15951595
features = Collections.emptySet();

0 commit comments

Comments
 (0)