Explorar o código

HPCC-15385 Fix strand regression in JOIN,ALL tests

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>
Jake Smith %!s(int64=9) %!d(string=hai) anos
pai
achega
63ff3eec09
Modificáronse 1 ficheiros con 7 adicións e 7 borrados
  1. 7 7
      thorlcr/activities/lookupjoin/thlookupjoinslave.cpp

+ 7 - 7
thorlcr/activities/lookupjoin/thlookupjoinslave.cpp

@@ -1573,6 +1573,13 @@ public:
 // IBCastReceive (only used if global)
     virtual void bCastReceive(CSendItem *sendItem, bool stop)
     {
+        if (bcast_stop == sendItem->queryCode())
+        {
+            sendItem->Release();
+            if (!stop)
+                return;
+            sendItem = NULL; // fall through, base signals stop to rowProcessor
+        }
         dbgassertex((sendItem==NULL) == stop); // if sendItem==NULL stop must = true, if sendItem != NULL stop must = false;
         rowProcessor->addBlock(sendItem);
     }
@@ -2663,13 +2670,6 @@ public:
                 VStringBuffer msg("Notification that node %d spilt", sendItem->queryNode());
                 clearAllNonLocalRows(msg.str());
             }
-            if (bcast_stop == sendItem->queryCode())
-            {
-                sendItem->Release();
-                if (!stop)
-                    return;
-                sendItem = NULL; // fall through, base signals stop to rowProcessor
-            }
         }
         PARENT::bCastReceive(sendItem, stop);
     }