You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gossip.apache.org by ec...@apache.org on 2017/01/13 22:32:02 UTC
[1/3] incubator-gossip git commit: GOSSIP-40: fix GossipMember hash
code bug
Repository: incubator-gossip
Updated Branches:
refs/heads/master f56d282d3 -> bc96cf6d3
GOSSIP-40: fix GossipMember hash code bug
Project: http://git-wip-us.apache.org/repos/asf/incubator-gossip/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-gossip/commit/62eb09a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-gossip/tree/62eb09a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-gossip/diff/62eb09a1
Branch: refs/heads/master
Commit: 62eb09a1dca77a50fa6961f2686a656f8cc9338e
Parents: 18c9f91
Author: laidonglin <go...@foxmail.com>
Authored: Tue Jan 10 16:30:10 2017 +0800
Committer: GitHub <no...@github.com>
Committed: Tue Jan 10 16:30:10 2017 +0800
----------------------------------------------------------------------
src/main/java/org/apache/gossip/GossipMember.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-gossip/blob/62eb09a1/src/main/java/org/apache/gossip/GossipMember.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/gossip/GossipMember.java b/src/main/java/org/apache/gossip/GossipMember.java
index 7ae4d81..a2f416e 100644
--- a/src/main/java/org/apache/gossip/GossipMember.java
+++ b/src/main/java/org/apache/gossip/GossipMember.java
@@ -116,8 +116,8 @@ public abstract class GossipMember implements Comparable<GossipMember> {
final int prime = 31;
int result = 1;
String address = getAddress();
- result = prime * result + ((address == null) ? 0 : address.hashCode()) + clusterName == null ? 0
- : clusterName.hashCode();
+ result = prime * result + ((address == null) ? 0 : address.hashCode()) + (clusterName == null ? 0
+ : clusterName.hashCode());
return result;
}
[2/3] incubator-gossip git commit: Merge branch 'master' of
https://github.com/goby/incubator-gossip
Posted by ec...@apache.org.
Merge branch 'master' of https://github.com/goby/incubator-gossip
Project: http://git-wip-us.apache.org/repos/asf/incubator-gossip/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-gossip/commit/4f4c15cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-gossip/tree/4f4c15cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-gossip/diff/4f4c15cb
Branch: refs/heads/master
Commit: 4f4c15cb07c30473811ed039a3dbb9df092c8b88
Parents: f56d282 62eb09a
Author: Edward Capriolo <ed...@gmail.com>
Authored: Fri Jan 13 17:26:16 2017 -0500
Committer: Edward Capriolo <ed...@gmail.com>
Committed: Fri Jan 13 17:26:16 2017 -0500
----------------------------------------------------------------------
src/main/java/org/apache/gossip/GossipMember.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[3/3] incubator-gossip git commit: GOSSIP-40 bad hashcode (Lai
Donglin via EGC)
Posted by ec...@apache.org.
GOSSIP-40 bad hashcode (Lai Donglin via EGC)
Project: http://git-wip-us.apache.org/repos/asf/incubator-gossip/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-gossip/commit/bc96cf6d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-gossip/tree/bc96cf6d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-gossip/diff/bc96cf6d
Branch: refs/heads/master
Commit: bc96cf6d348b340c3f60c4a80cb7fdc2e6aa44b1
Parents: 4f4c15c
Author: Edward Capriolo <ed...@gmail.com>
Authored: Fri Jan 13 17:31:02 2017 -0500
Committer: Edward Capriolo <ed...@gmail.com>
Committed: Fri Jan 13 17:31:02 2017 -0500
----------------------------------------------------------------------
.../org/apache/gossip/GossipMemberTest.java | 22 ++++++++++++++++++++
.../org/apache/gossip/StartupSettingsTest.java | 4 ----
2 files changed, 22 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-gossip/blob/bc96cf6d/src/test/java/org/apache/gossip/GossipMemberTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/gossip/GossipMemberTest.java b/src/test/java/org/apache/gossip/GossipMemberTest.java
new file mode 100644
index 0000000..635d66c
--- /dev/null
+++ b/src/test/java/org/apache/gossip/GossipMemberTest.java
@@ -0,0 +1,22 @@
+package org.apache.gossip;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+import org.junit.platform.runner.JUnitPlatform;
+import org.junit.runner.RunWith;
+
+@RunWith(JUnitPlatform.class)
+public class GossipMemberTest {
+
+ @Test
+ public void testHashCodeFromGossip40() throws URISyntaxException {
+ Assert.assertNotEquals(
+ new LocalGossipMember("mycluster", new URI("udp://4.4.4.4:1000"), "myid", 1, 10, 5)
+ .hashCode(),
+ new LocalGossipMember("mycluster", new URI("udp://4.4.4.5:1005"), "yourid", 11, 11, 6)
+ .hashCode());
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-gossip/blob/bc96cf6d/src/test/java/org/apache/gossip/StartupSettingsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/gossip/StartupSettingsTest.java b/src/test/java/org/apache/gossip/StartupSettingsTest.java
index 73c758a..a798594 100644
--- a/src/test/java/org/apache/gossip/StartupSettingsTest.java
+++ b/src/test/java/org/apache/gossip/StartupSettingsTest.java
@@ -19,8 +19,6 @@ package org.apache.gossip;
import org.apache.log4j.Logger;
-import io.teknek.tunit.TUnit;
-
import org.junit.jupiter.api.Test;
import java.io.File;
@@ -30,8 +28,6 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.TimeUnit;
import org.junit.platform.runner.JUnitPlatform;
import org.junit.runner.RunWith;