From 64dac1e9c65e7e809db0bffd9aac1afea86568a6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?=
 <bombe@freenetproject.org>
Date: Tue, 24 Mar 2009 15:51:39 +0100
Subject: [PATCH] =?utf8?q?Change=20method=20of=20getting=20persistent=20ge?=
 =?utf8?q?t=20requests=20that=20does=20not=20change=20the=20=E2=80=9CWatch?=
 =?utf8?q?Global=E2=80=9D=20setting.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/net/pterodactylus/fcp/highlevel/FcpClient.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/net/pterodactylus/fcp/highlevel/FcpClient.java b/src/net/pterodactylus/fcp/highlevel/FcpClient.java
index dae7546..30424ac 100644
--- a/src/net/pterodactylus/fcp/highlevel/FcpClient.java
+++ b/src/net/pterodactylus/fcp/highlevel/FcpClient.java
@@ -52,7 +52,6 @@ import net.pterodactylus.fcp.PersistentGet;
 import net.pterodactylus.fcp.ProtocolError;
 import net.pterodactylus.fcp.RemovePeer;
 import net.pterodactylus.fcp.SSKKeypair;
-import net.pterodactylus.fcp.WatchGlobal;
 import net.pterodactylus.util.thread.ObjectWrapper;
 
 /**
@@ -565,7 +564,6 @@ public class FcpClient {
 			@Override
 			@SuppressWarnings("synthetic-access")
 			public void run() throws IOException {
-				fcpConnection.sendMessage(new WatchGlobal(global));
 				fcpConnection.sendMessage(new ListPersistentRequests());
 			}
 
@@ -574,7 +572,9 @@ public class FcpClient {
 			 */
 			@Override
 			public void receivedPersistentGet(FcpConnection fcpConnection, PersistentGet persistentGet) {
-				getRequests.add(persistentGet);
+				if (!persistentGet.isGlobal() || global) {
+					getRequests.add(persistentGet);
+				}
 			}
 
 			/**
-- 
2.7.4