From 19d654b7c2f2e16a132ed73e097d865e6280ca58 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 24 Jan 2013 10:21:26 +0100 Subject: [PATCH] Remove stale subscriptions from local endpoint Fixes #3563 --- lib/remoting/endpointmanager.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/remoting/endpointmanager.cpp b/lib/remoting/endpointmanager.cpp index 077b10643..883b260ff 100644 --- a/lib/remoting/endpointmanager.cpp +++ b/lib/remoting/endpointmanager.cpp @@ -331,7 +331,8 @@ void EndpointManager::SubscriptionTimerHandler(void) BOOST_FOREACH(tie(tuples::ignore, object), DynamicType::GetByName("Endpoint")->GetObjects()) { Endpoint::Ptr endpoint = dynamic_pointer_cast(object); - if (!endpoint->IsLocalEndpoint()) + /* don't copy subscriptions from non-local endpoints or the identity endpoint */ + if (!endpoint->IsLocalEndpoint() || endpoint == m_Endpoint) continue; if (endpoint->GetSubscriptions()) {