Merge branch 'master' into development/facilitate-lookup

rdkcentral · Dec 17, 2024 · e365199 · e365199
2 parents 92aa671 + c3c006d
commit e365199
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/Source/Thunder/PluginServer.h b/Source/Thunder/PluginServer.h
@@ -2726,12 +2726,8 @@ namespace PluginHost {
             POP_WARNING()
             ~ServiceMap()
             {
-                Core::ProxyType<Core::IDispatch> job(_job.Revoke());
+                _job.Revoke();
 
-                if (job.IsValid()) {
-                    WorkerPool().Revoke(job);
-                    _job.Revoked();
-                }
                 // Make sure all services are deactivated before we are killed (call Destroy on this object);
                 ASSERT(_services.size() == 0);
             }
@@ -3500,7 +3496,7 @@ namespace PluginHost {
             ChannelObservers _channelObservers;
             Channels _opened;
             Channels _closed;
-            Core::ThreadPool::JobType<ServiceMap&> _job;
+            Core::WorkerPool::JobType<ServiceMap&> _job;
         };
 
         // Connection handler is the listening socket and keeps track of all open

diff --git a/Source/com/IUnknown.h b/Source/com/IUnknown.h
@@ -387,7 +387,7 @@ namespace ProxyStub {
                 delete &_parent;
             }
         }
-        inline uint32_t Complete(const Core::instance_id& impl, const uint32_t id, const RPC::Data::Output::mode how)
+        inline uint32_t Complete(const Core::instance_id& impl, const uint32_t id, const RPC::Data::Output::mode how) const
         {
             // This method is called from the stubs.
             uint32_t result = Core::ERROR_NONE;
@@ -500,7 +500,7 @@ POP_WARNING()
         {
             return (_unknown.Interface(implementation, id));
         }
-        uint32_t Complete(const Core::instance_id& instance, const uint32_t id, const RPC::Data::Output::mode how)
+        uint32_t Complete(const Core::instance_id& instance, const uint32_t id, const RPC::Data::Output::mode how) const
         {
             return (_unknown.Complete(instance, id, how));
         }