You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2016/12/02 18:46:32 UTC
incubator-geode git commit: GEODE-2137: Spotless
Repository: incubator-geode
Updated Branches:
refs/heads/develop f920f55ac -> 7be3f99e3
GEODE-2137: Spotless
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7be3f99e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7be3f99e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7be3f99e
Branch: refs/heads/develop
Commit: 7be3f99e39656cf812105d02cf023ca9b28137b9
Parents: f920f55
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Fri Dec 2 10:46:28 2016 -0800
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Fri Dec 2 10:46:28 2016 -0800
----------------------------------------------------------------------
.../internal/membership/InternalDistributedMember.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7be3f99e/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 ae9b3c5..7955d34 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
@@ -895,9 +895,9 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
Version.writeOrdinal(out, version, true);
Version streamVersion = InternalDataSerializer.getVersionForDataStream(out);
-
- if (streamVersion.ordinal() >= Version.GFE_90.ordinal()
- && version >= Version.GFE_90.ordinal() && writeNetMbrData) {
+
+ if (streamVersion.ordinal() >= Version.GFE_90.ordinal() && version >= Version.GFE_90.ordinal()
+ && writeNetMbrData) {
getNetMember().writeAdditionalData(out);
}
}
@@ -996,8 +996,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
// from a file we ought to check the version
Version streamVersion = InternalDataSerializer.getVersionForDataStream(in);
- if (streamVersion.ordinal() >= Version.GFE_90.ordinal()
- && version >= Version.GFE_90.ordinal()
+ if (streamVersion.ordinal() >= Version.GFE_90.ordinal() && version >= Version.GFE_90.ordinal()
&& (flags & NETMBR_DATA_BIT) == NETMBR_DATA_BIT) {
netMbr.readAdditionalData(in);
}