Merge branch 'candidate-7.0.x' into candidate-7.2.0

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

ecl/hthor/hthor.cpp

@@ -8065,17 +8065,17 @@ void CHThorDiskReadBaseActivity::ready()
     IDistributedFile *dFile = nullptr;
     if (ldFile)
         dFile = ldFile->queryDistributedFile();  // Null for local file usage
+
+    Linked<IOutputMetaData> publishedMeta = actualDiskMeta;
+    unsigned publishedCrc = actualCrc;
     if (dFile)
     {
         IPropertyTree &props = dFile->queryAttributes();
-        Owned<IOutputMetaData> publishedMeta = getDaliLayoutInfo(props);
+        publishedMeta.setown(getDaliLayoutInfo(props));
         if (publishedMeta)
-        {
-            actualDiskMeta.setown(publishedMeta.getClear());
-            actualCrc = props.getPropInt("@formatCrc");
-        }
+            publishedCrc = props.getPropInt("@formatCrc");
     }
-    translators.setown(::getTranslators("hthor-diskread", expectedCrc, expectedDiskMeta, actualCrc, actualDiskMeta, projectedCrc, projectedDiskMeta, getLayoutTranslationMode()));
+    translators.setown(::getTranslators("hthor-diskread", expectedCrc, expectedDiskMeta, publishedCrc, publishedMeta, projectedCrc, projectedDiskMeta, getLayoutTranslationMode()));
     if (translators)
     {
         translator = &translators->queryTranslator();
@@ -8357,7 +8357,9 @@ bool CHThorDiskReadBaseActivity::openNext()
                             }
                             catch (IException *e)
                             {
+#ifdef _DEBUG
                                 EXCLOG(e, nullptr);
+#endif
                                 e->Release();
                                 continue; // try next copy and ultimately failover to local when no more copies
                             }

esp/src/eclwatch/DFUQueryWidget.js

@@ -387,7 +387,6 @@ define([
                 }
 
                 this.updatedFilter = JSON.parse(JSON.stringify(retVal));    // Deep copy as checkIfWarning will append _rawxml to it  ---
-                this.checkIfWarning();
 
                 return retVal;
             },
@@ -442,6 +441,7 @@ define([
                 });
 
                 this.initWorkunitsGrid();
+                this.checkIfWarning();
 
                 this.filter.on("clear", function (evt) {
                     context.refreshHRef();

thorlcr/activities/diskread/thdiskreadslave.cpp

@@ -325,7 +325,9 @@ void CDiskRecordPartHandler::open()
                 }
                 catch (IException *e)
                 {
+#ifdef _DEBUG
                     EXCLOG(e, nullptr);
+#endif
                     e->Release();
                     continue; // try next copy and ultimately failover to local when no more copies
                 }

thorlcr/activities/indexread/thindexreadslave.cpp

@@ -239,7 +239,9 @@ public:
                             }
                             catch (IException *e)
                             {
+#ifdef _DEBUG
                                 EXCLOG(e, nullptr);
+#endif
                                 e->Release();
                                 continue; // try next copy and ultimately failover to local when no more copies
                             }