From 532b91ffa676986c013c12a43cc87c5aae5d68bc Mon Sep 17 00:00:00 2001
From: Jim Ferenczi <jimczi@apache.org>
Date: Wed, 30 May 2018 14:22:48 +0200
Subject: [PATCH] Fix composite agg serialization error

Fix serialization after backport

Relates #29465
---
 .../bucket/composite/CompositeValuesSourceBuilder.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java
index cb9c550c05d..32a94f59be5 100644
--- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java
+++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java
@@ -72,8 +72,8 @@ public abstract class CompositeValuesSourceBuilder<AB extends CompositeValuesSou
         } else {
             this.missingBucket = false;
         }
-        if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
-            // skip missing value
+        if (in.getVersion().before(Version.V_7_0_0_alpha1)) {
+            // skip missing value for BWC
             in.readGenericValue();
         }
         this.order = SortOrder.readFromStream(in);
@@ -98,10 +98,11 @@ public abstract class CompositeValuesSourceBuilder<AB extends CompositeValuesSou
         if (hasValueType) {
             valueType.writeTo(out);
         }
-        if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
+        if (out.getVersion().onOrAfter(Version.V_6_4_0)) {
             out.writeBoolean(missingBucket);
         }
-        if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
+        if (out.getVersion().before(Version.V_7_0_0_alpha1)) {
+            // write missing value for BWC
             out.writeGenericValue(null);
         }
         order.writeTo(out);