You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuweni.apache.org by to...@apache.org on 2019/04/26 00:23:57 UTC
[incubator-tuweni] 19/48: Make sure you don't receive a message you
sent
This is an automated email from the ASF dual-hosted git repository.
toulmean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git
commit b7588a8c450c8a2ca4f845c5afd1db7da5067990
Author: Antoine Toulme <to...@apache.org>
AuthorDate: Mon Apr 8 23:05:08 2019 -0700
Make sure you don't receive a message you sent
---
plumtree/src/main/java/org/apache/tuweni/plumtree/State.java | 4 +++-
.../java/org/apache/tuweni/plumtree/vertx/VertxGossipServerTest.java | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/plumtree/src/main/java/org/apache/tuweni/plumtree/State.java b/plumtree/src/main/java/org/apache/tuweni/plumtree/State.java
index bb71818..b65fdbe 100644
--- a/plumtree/src/main/java/org/apache/tuweni/plumtree/State.java
+++ b/plumtree/src/main/java/org/apache/tuweni/plumtree/State.java
@@ -90,7 +90,9 @@ public final class State {
.filter(p -> !lazyPeers.contains(p))
.map(peer -> (Runnable) (() -> messageSender.sendMessage(MessageSender.Verb.IHAVE, peer, hash, null)))
.collect(Collectors.toList()));
- messageListener.accept(message);
+ if (sender != null) {
+ messageListener.accept(message);
+ }
}
} else {
if (sender != null) {
diff --git a/plumtree/src/test/java/org/apache/tuweni/plumtree/vertx/VertxGossipServerTest.java b/plumtree/src/test/java/org/apache/tuweni/plumtree/vertx/VertxGossipServerTest.java
index f465afb..d6e6106 100644
--- a/plumtree/src/test/java/org/apache/tuweni/plumtree/vertx/VertxGossipServerTest.java
+++ b/plumtree/src/test/java/org/apache/tuweni/plumtree/vertx/VertxGossipServerTest.java
@@ -13,6 +13,7 @@
package org.apache.tuweni.plumtree.vertx;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.tuweni.bytes.Bytes;
@@ -106,6 +107,7 @@ class VertxGossipServerTest {
Thread.sleep(1000);
assertEquals(Bytes.fromHexString("deadbeef"), messageReceived2.get());
assertEquals(Bytes.fromHexString("deadbeef"), messageReceived3.get());
+ assertNull(messageReceived1.get());
server1.stop().join();
server2.stop().join();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tuweni.apache.org
For additional commands, e-mail: commits-help@tuweni.apache.org