Remove stale subscriptions from local endpoint

Fixes #3563

diff --git a/lib/remoting/endpointmanager.cpp b/lib/remoting/endpointmanager.cpp
index 077b10643f45faee6781d34259bd9f7ac09e3261..883b260ff631153b45d7daf30601d6b1f7db2207 100644 (file)
--- 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<Endpoint>(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()) {