Просмотр исходного кода

Merge pull request #7831 from jakesmith/hpcc-14270

HPCC-14270 Enth could deadlock if numerator = 0

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Gavin Halliday 9 лет назад
Родитель
Сommit
8dd89cff07
1 измененных файлов с 3 добавлено и 1 удалено
  1. 3 1
      thorlcr/activities/enth/thenthslave.cpp

+ 3 - 1
thorlcr/activities/enth/thenthslave.cpp

@@ -97,7 +97,9 @@ public:
             ThorDataLinkMetaInfo info;
             input->getMetaInfo(info);
             // Need lookahead _unless_ row count pre-known.
-            if (info.totalRowsMin == info.totalRowsMax)
+            if (0 == numerator)
+                localRecCount = 0;
+            else if (info.totalRowsMin == info.totalRowsMax)
             {
                 localRecCount = (rowcount_t)info.totalRowsMax;
                 ActPrintLog("%s: row count pre-known to be %" RCPF "d", actStr.str(), localRecCount);