Explorar o código

Merge pull request #6022 from richardkchapman/roxie-lockdali-core

HPCC-11618 Roxie core when detaching from dali

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Gavin Halliday %!s(int64=11) %!d(string=hai) anos
pai
achega
2c2c07a274
Modificáronse 2 ficheiros con 2 adicións e 1 borrados
  1. 1 1
      roxie/ccd/ccddali.cpp
  2. 1 0
      roxie/ccd/ccdlistener.cpp

+ 1 - 1
roxie/ccd/ccddali.cpp

@@ -726,10 +726,10 @@ public:
                 closeDllServer();
                 closeEnvironment();
                 clientShutdownWorkUnit();
+                disconnectRoxieQueues();
                 ::closedownClientProcess(); // dali client closedown
                 isConnected = false;
                 disconnectSem.signal();
-                disconnectRoxieQueues();
             }
         }
     }

+ 1 - 0
roxie/ccd/ccdlistener.cpp

@@ -863,6 +863,7 @@ public:
         {
             DBGLOG("RoxieWorkUnitListener::disconnectQueue");
             queue->cancelAcceptConversation();
+            queue.clear();
         }
     }