diff --git a/server/src/main/java/org/elasticsearch/common/Rounding.java b/server/src/main/java/org/elasticsearch/common/Rounding.java index 451517481b75c..63f30a9c4fb08 100644 --- a/server/src/main/java/org/elasticsearch/common/Rounding.java +++ b/server/src/main/java/org/elasticsearch/common/Rounding.java @@ -252,7 +252,7 @@ static class TimeUnitRounding extends Rounding { } TimeUnitRounding(StreamInput in) throws IOException { - this(DateTimeUnit.resolve(in.readByte()), in.readZoneId()); + this(DateTimeUnit.resolve(in.readByte()), DateUtils.of(in.readString())); } @Override @@ -467,7 +467,7 @@ static class TimeIntervalRounding extends Rounding { } TimeIntervalRounding(StreamInput in) throws IOException { - this(in.readVLong(), in.readZoneId()); + this(in.readVLong(), DateUtils.of(in.readString())); } @Override diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/InternalAggregationsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/InternalAggregationsTests.java index 9dc214f3d1993..c19727041ddd9 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/InternalAggregationsTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/InternalAggregationsTests.java @@ -120,7 +120,6 @@ public static InternalAggregations createTestInstance() throws Exception { return new InternalAggregations(aggsList, topLevelPipelineAggs); } - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/50827") public void testSerialization() throws Exception { InternalAggregations aggregations = createTestInstance(); writeToAndReadFrom(aggregations, 0);