honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Jason Tedor 2018-06-01 17:11:34 -04:00
parent f8785dda9d
commit 3670a2ae05
No known key found for this signature in database
GPG Key ID: FA89F05560F16BC5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,7 +105,7 @@ final class ESLoggingHandler extends LoggingHandler {
context.readHeaders(in);
}
// now we decode the features
if (in.getVersion().onOrAfter(Version.V_6_4_0)) {
if (in.getVersion().onOrAfter(Version.V_6_3_0)) {
in.readStringArray();
}
// now we can decode the action name

4
server/src/main/java/org/elasticsearch/transport/TcpTransport.java
View File

@ -1121,7 +1121,7 @@ public abstract class TcpTransport extends AbstractLifecycleComponent implements
stream.setVersion(version);
threadPool.getThreadContext().writeTo(stream);
if (version.onOrAfter(Version.V_6_4_0)) {
if (version.onOrAfter(Version.V_6_3_0)) {
stream.writeStringArray(features);
}
stream.writeString(action);
@ -1589,7 +1589,7 @@ public abstract class TcpTransport extends AbstractLifecycleComponent implements
int messageLengthBytes, Version version, InetSocketAddress remoteAddress, byte status)
throws IOException {
final Set<String> features;
if (version.onOrAfter(Version.V_6_4_0)) {
if (version.onOrAfter(Version.V_6_3_0)) {
features = Collections.unmodifiableSet(new TreeSet<>(Arrays.asList(stream.readStringArray())));
} else {
features = Collections.emptySet();