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

Merge pull request #10590 from shamser/issue18649

HPCC-18649 Only call setMeasure for non-empty measure

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Gavin Halliday 7 лет назад
Родитель
Сommit
d87eac0936
1 измененных файлов с 3 добавлено и 1 удалено
  1. 3 1
      esp/services/ws_workunits/ws_wudetails.cpp

+ 3 - 1
esp/services/ws_workunits/ws_wudetails.cpp

@@ -320,7 +320,9 @@ void WUDetails::buildWuScopeFilter(IConstWUScopeFilter & requestScopeFilter, ICo
 {
     wuScopeFilter.addFilter(filter);
     wuScopeFilter.setDepth(0, requestScopeFilter.getMaxDepth());
-    wuScopeFilter.setMeasure(propertiesToReturn.getMeasure());
+    const char * measure = propertiesToReturn.getMeasure();
+    if (measure && *measure)
+        wuScopeFilter.setMeasure(measure);
     wuScopeFilter.setIncludeNesting(nestedFilter.getDepth());
     wuScopeFilter.setIncludeMatch(scopeOptions.getIncludeMatchedScopesInResults());