Changes following review

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
hpcc-systems · Oct 9, 2024 · e2c6a68 · e2c6a68
1 parent c17389d
commit e2c6a68
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/roxie/ccd/ccdqueue.cpp b/roxie/ccd/ccdqueue.cpp
@@ -1315,8 +1315,10 @@ class RoxieQueue : public CInterface, implements IThreadFactory
     void wait()
     {
         idle++;
-        CLeavableCriticalBlock b(availCrit, limitWaitingWorkers);
-        available.wait();
+        {
+            CLeavableCriticalBlock b(availCrit, limitWaitingWorkers);
+            available.wait();
+        }
         idle--;
     }
 
@@ -1399,16 +1401,17 @@ class CRoxieWorker : public CInterface, implements IPooledThread
     }
     inline void setPacket(IRoxieQueryPacket *p)
     {
+        Owned<IRoxieQueryPacket> temp(p);
         CriticalBlock b(actCrit);
         if (p)
         {
-            packet.setown(p);
+            packet.swap(temp);
             packetHeader.copy(p->queryHeader());
         }
         else
         {
             packetHeader.clear();
-            packet.setown(p);
+            packet.swap(temp);
         }
     }
     inline bool match(RoxiePacketHeader &h)