Repository: geode Updated Branches: refs/heads/rollback/1.2.0_memberID 57fdb34f4 -> a20998988
Revert serialized form of InternalDistributedMember to 1.0.0-incubating This reopens GEODE-2137 on this branch... GEODE-2137: client membership IDs contain 17 bytes of useless information Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/a2099898 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/a2099898 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/a2099898 Branch: refs/heads/rollback/1.2.0_memberID Commit: a209989882bceac3adfbf09e21315b9d2eb08ea3 Parents: 57fdb34 Author: Bruce Schuchardt <[email protected]> Authored: Fri Jul 7 11:54:45 2017 -0700 Committer: Bruce Schuchardt <[email protected]> Committed: Fri Jul 7 15:28:13 2017 -0700 ---------------------------------------------------------------------- .../internal/membership/InternalDistributedMember.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/a2099898/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java index 4260412..c0a7d18 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java @@ -847,7 +847,8 @@ public class InternalDistributedMember implements DistributedMember, Externaliza netMbr = MemberFactory.newNetMember(inetAddr, port, sbEnabled, elCoord, version, new MemberAttributes(dcPort, vmPid, vmKind, vmViewId, name, groups, durableClientAttributes)); - if (version >= Version.GFE_90.ordinal() && targetHasUUIDBytes(InternalDataSerializer.getVersionForDataStream(in))) { + if (version >= Version.GFE_90.ordinal() + && targetHasUUIDBytes(InternalDataSerializer.getVersionForDataStream(in))) { try { netMbr.readAdditionalData(in); } catch (java.io.EOFException e) { @@ -859,7 +860,8 @@ public class InternalDistributedMember implements DistributedMember, Externaliza } boolean targetHasUUIDBytes(Version targetVersion) { - return targetVersion.ordinal() < Version.GEODE_110.ordinal() || targetVersion.ordinal() >= Version.GEODE_120.ordinal(); + return targetVersion.ordinal() < Version.GEODE_110.ordinal() + || targetVersion.ordinal() >= Version.GEODE_120.ordinal(); } public int getDSFID() {
