From: David ‘Bombe’ Roden <bombe@freenetproject.org>
Date: Thu, 19 Mar 2009 22:34:18 +0000 (+0100)
Subject: Use distinct identifier for every “ListPeers” request.
X-Git-Tag: v0.1.1~77
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=9eeeeee78c2b7c3f6e8cda59779f1c9be036357e;p=jFCPlib.git

Use distinct identifier for every “ListPeers” request.
Only react to “Peer” and “EndListPeers” messages with the same identifier.
---

diff --git a/src/net/pterodactylus/fcp/highlevel/FcpClient.java b/src/net/pterodactylus/fcp/highlevel/FcpClient.java
index 90ad4da..71b118e 100644
--- a/src/net/pterodactylus/fcp/highlevel/FcpClient.java
+++ b/src/net/pterodactylus/fcp/highlevel/FcpClient.java
@@ -23,6 +23,7 @@ import java.io.IOException;
 import java.net.InetAddress;
 import java.net.URL;
 import java.net.UnknownHostException;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
@@ -197,16 +198,19 @@ public class FcpClient {
 	 *             if an FCP error occurs
 	 */
 	public Set<Peer> getPeers(final boolean withMetadata, final boolean withVolatile) throws IOException, FcpException {
-		final Set<Peer> peers = new HashSet<Peer>();
+		final Set<Peer> peers = Collections.synchronizedSet(new HashSet<Peer>());
 		new ExtendedFcpAdapter() {
 
+			/** The ID of the “ListPeers” request. */
+			private String identifier = "list-peers-" + System.currentTimeMillis();
+
 			/**
 			 * {@inheritDoc}
 			 */
 			@Override
 			@SuppressWarnings("synthetic-access")
 			public void run() throws IOException {
-				fcpConnection.sendMessage(new ListPeers("list-peers", withMetadata, withVolatile));
+				fcpConnection.sendMessage(new ListPeers(identifier, withMetadata, withVolatile));
 			}
 
 			/**
@@ -214,7 +218,9 @@ public class FcpClient {
 			 */
 			@Override
 			public void receivedPeer(FcpConnection fcpConnection, Peer peer) {
-				peers.add(peer);
+				if (peer.getIdentifier().equals(identifier)) {
+					peers.add(peer);
+				}
 			}
 
 			/**
@@ -222,7 +228,9 @@ public class FcpClient {
 			 */
 			@Override
 			public void receivedEndListPeers(FcpConnection fcpConnection, EndListPeers endListPeers) {
-				completionLatch.countDown();
+				if (endListPeers.getIdentifier().equals(identifier)) {
+					completionLatch.countDown();
+				}
 			}
 		}.execute();
 		return peers;