Improve performance for ApiListener::SyncRelayMessage

refs #11014

diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp
index 5f5961d12e9cd50521ae71e6fff69ec7790c30c5..92d42ac24160ad05a64b67f9aca42f607b248f12 100644 (file)
--- a/lib/remote/apilistener.cpp
+++ b/lib/remote/apilistener.cpp
@@ -642,13 +642,12 @@ void ApiListener::SyncRelayMessage(const MessageOrigin::Ptr& origin,
 
                Zone::Ptr target_zone = endpoint->GetZone();
 
-               allZones.insert(target_zone);
 
                /* only relay messages to zones which have access to the object */
-               if (!target_zone->CanAccessObject(secobj)) {
-                       finishedLogZones.insert(target_zone);
+               if (!target_zone->CanAccessObject(secobj))
                        continue;
-               }
+
+               allZones.insert(target_zone);
 
                /* don't relay messages to disconnected endpoints */
                if (!endpoint->GetConnected()) {

diff --git a/lib/remote/zone.cpp b/lib/remote/zone.cpp
index 12b6b4b1f9ceef3284d0b2032ad819b36ee05879..311b11ccac989cb3fe77e731e38a33676ab90c3b 100644 (file)
--- a/lib/remote/zone.cpp
+++ b/lib/remote/zone.cpp
@@ -63,7 +63,7 @@ bool Zone::CanAccessObject(const ConfigObject::Ptr& object)
 {
        Zone::Ptr object_zone;
 
-       if (dynamic_pointer_cast<Zone>(object))
+       if (object->GetReflectionType() == Zone::TypeInstance)
                object_zone = static_pointer_cast<Zone>(object);
        else
                object_zone = static_pointer_cast<Zone>(object->GetZone());