Repository: geode Updated Branches: refs/heads/rollback/1.2.0_memberID 40fdc5d33 -> 57fdb34f4
GEODE-2954 - partial revert for 1.2.0 release This reverts changes to EventID made for GEODE-2954. Changes to Banner.java, Version.java and unit tests have been retained. Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/d5b3b65d Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/d5b3b65d Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/d5b3b65d Branch: refs/heads/rollback/1.2.0_memberID Commit: d5b3b65d6ecbb463e68c16c4f0ab549546a441bd Parents: 40fdc5d Author: Bruce Schuchardt <[email protected]> Authored: Fri Jul 7 11:22:49 2017 -0700 Committer: Bruce Schuchardt <[email protected]> Committed: Fri Jul 7 11:22:49 2017 -0700 ---------------------------------------------------------------------- .../org/apache/geode/internal/cache/EventID.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/d5b3b65d/geode-core/src/main/java/org/apache/geode/internal/cache/EventID.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EventID.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EventID.java index 8621649..468d241 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/EventID.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EventID.java @@ -27,7 +27,6 @@ import java.nio.ByteBuffer; import java.util.Arrays; import java.util.concurrent.atomic.AtomicLong; -import org.apache.geode.internal.InternalDataSerializer; import org.apache.logging.log4j.Logger; import org.apache.geode.DataSerializer; @@ -339,21 +338,7 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali } public void toData(DataOutput dop) throws IOException { - Version version = InternalDataSerializer.getVersionForDataStream(dop); - // if we are sending to old clients we need to reserialize the ID - // using the client's version to ensure it gets the proper on-wire form - // of the identifier - // See GEODE-3072 - if (version.compareTo(Version.GEODE_110) < 0) { - InternalDistributedMember member = getDistributedMember(version); - // reserialize with the client's version so that we write the UUID - // bytes - HeapDataOutputStream hdos = new HeapDataOutputStream(version); - member.writeEssentialData(hdos); - DataSerializer.writeByteArray(hdos.toByteArray(), dop); - } else { - DataSerializer.writeByteArray(this.membershipID, dop); - } + DataSerializer.writeByteArray(this.membershipID, dop); DataSerializer.writeByteArray(getOptimizedByteArrayForEventID(this.threadID, this.sequenceID), dop); dop.writeInt(this.bucketID);
