This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a commit to branch feature/GEODE-8517 in repository https://gitbox.apache.org/repos/asf/geode.git
commit b3a2976be0d51954240729572f1e60dc5b6ef23d Author: zhouxh <[email protected]> AuthorDate: Mon Sep 21 20:30:57 2020 -0700 GEODE-8517: GatewaySenderEventImpl's 2 new attributes were introduced in 1.14 not 1.13 --- .../geode/internal/cache/wan/GatewaySenderEventImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java index 88f19f3..e4a8b75 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java @@ -710,7 +710,7 @@ public class GatewaySenderEventImpl @Override public void toData(DataOutput out, SerializationContext context) throws IOException { - toDataPre_GEODE_1_13_0_0(out, context); + toDataPre_GEODE_1_14_0_0(out, context); boolean hasTransaction = this.transactionId != null; DataSerializer.writeBoolean(hasTransaction, out); if (hasTransaction) { @@ -719,7 +719,7 @@ public class GatewaySenderEventImpl } } - public void toDataPre_GEODE_1_13_0_0(DataOutput out, + public void toDataPre_GEODE_1_14_0_0(DataOutput out, SerializationContext context) throws IOException { toDataPre_GEODE_1_9_0_0(out, context); DataSerializer.writeBoolean(this.isConcurrencyConflict, out); @@ -754,8 +754,8 @@ public class GatewaySenderEventImpl @Override public void fromData(DataInput in, DeserializationContext context) throws IOException, ClassNotFoundException { - fromDataPre_GEODE_1_13_0_0(in, context); - if (version >= KnownVersion.GEODE_1_13_0.ordinal()) { + fromDataPre_GEODE_1_14_0_0(in, context); + if (version >= KnownVersion.GEODE_1_14_0.ordinal()) { boolean hasTransaction = DataSerializer.readBoolean(in); if (hasTransaction) { this.isLastEventInTransaction = DataSerializer.readBoolean(in); @@ -764,7 +764,7 @@ public class GatewaySenderEventImpl } } - public void fromDataPre_GEODE_1_13_0_0(DataInput in, DeserializationContext context) + public void fromDataPre_GEODE_1_14_0_0(DataInput in, DeserializationContext context) throws IOException, ClassNotFoundException { fromDataPre_GEODE_1_9_0_0(in, context); if (version >= KnownVersion.GEODE_1_9_0.ordinal()) { @@ -1287,7 +1287,7 @@ public class GatewaySenderEventImpl @Override public KnownVersion[] getSerializationVersions() { - return new KnownVersion[] {KnownVersion.GEODE_1_9_0, KnownVersion.GEODE_1_13_0}; + return new KnownVersion[] {KnownVersion.GEODE_1_9_0, KnownVersion.GEODE_1_14_0}; } public int getSerializedValueSize() {
