From a061ff34b09f1ff212b4e7ae22be20d8689d2d72 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Sun, 14 Jul 2019 10:38:07 -0700 Subject: [PATCH] Use specific version constant for wire bwc check This commit modifies bwc behavior in FindFileStructureAction to check against a concrete version instead of Version.CURRENT. Checking against Version.CURRENT does not work since it is changing, in addition to it having different meanings on each branch. relates #42501 --- .../xpack/core/ml/action/FindFileStructureAction.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/FindFileStructureAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/FindFileStructureAction.java index 7baa907f2e521..14222075d6015 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/FindFileStructureAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/FindFileStructureAction.java @@ -338,7 +338,7 @@ public ActionRequestValidationException validate() { public void readFrom(StreamInput in) throws IOException { super.readFrom(in); linesToSample = in.readOptionalVInt(); - if (in.getVersion().onOrAfter(Version.CURRENT)) { + if (in.getVersion().onOrAfter(Version.V_7_3_0)) { lineMergeSizeLimit = in.readOptionalVInt(); } timeout = in.readOptionalTimeValue(); @@ -359,7 +359,7 @@ public void readFrom(StreamInput in) throws IOException { public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeOptionalVInt(linesToSample); - if (out.getVersion().onOrAfter(Version.CURRENT)) { + if (out.getVersion().onOrAfter(Version.V_7_3_0)) { out.writeOptionalVInt(lineMergeSizeLimit); } out.writeOptionalTimeValue(timeout);