Explorar el Código

Merge pull request #13806 from jakesmith/hpcc-24128-fix-hthor-mixed-remote

HPCC-24128 Fix crash if mixed local/remote files

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Gavin Halliday hace 5 años
padre
commit
5868330195
Se han modificado 1 ficheros con 4 adiciones y 2 borrados
  1. 4 2
      ecl/hthor/hthor.cpp

+ 4 - 2
ecl/hthor/hthor.cpp

@@ -8369,9 +8369,11 @@ bool CHThorDiskReadBaseActivity::openNext()
     actualFilter.clear();
     if (translators)
     {
-        /* if previous part was remotely accessed, the format used (actualDiskMeta), became the projected meta
-         * reset here, in case this next part is access locally, in which case the published or expect meta is needed
+        /* If previous part was remotely accessed, the format used (actualDiskMeta), became the projected meta.
+         * Reset for local/direct access.
          */
+        translator = &translators->queryTranslator();
+        keyedTranslator = translators->queryKeyedTranslator();
         actualDiskMeta.set(&translators->queryActualFormat());
     }