HPCC-30468 review changes

Signed-off-by: Jake Smith <[email protected]>
hpcc-systems · Oct 11, 2023 · b398061 · b398061
1 parent fba1d45
commit b398061
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/dali/base/dautils.cpp b/dali/base/dautils.cpp
@@ -3647,9 +3647,15 @@ void remapGroupsToDafilesrv(IPropertyTree *file, INamedGroupStore *resolver)
                 group.setown(resolver->lookup(planeName, defaultDir, groupType));
             }
 
+            Linked<INode> dafileSrvNodeCopy;
+            {
+                // in case config hook above changes dafileSrvNode
+                CriticalBlock b(dafileSrvNodeCS);
+                dafileSrvNodeCopy.set(dafileSrvNode);
+            }
             std::vector<INode *> nodes;
             for (unsigned n=0; n<group->ordinality(); n++)
-                nodes.push_back(dafileSrvNode);
+                nodes.push_back(dafileSrvNodeCopy);
             Owned<IGroup> newGroup = createIGroup((rank_t)group->ordinality(), &nodes[0]);
             StringBuffer groupText;
             newGroup->getText(groupText);

diff --git a/esp/clients/ws_dfsclient/ws_dfsclient.cpp b/esp/clients/ws_dfsclient/ws_dfsclient.cpp
@@ -688,7 +688,7 @@ IDFSFile *lookupDFSFile(const char *logicalName, AccessMode accessMode, unsigned
         // auto-discover local environment dfs service.
 #ifdef _CONTAINERIZED
         // NB: only expected to be here if experimental option #option('dfsesp-localfiles', true); is in use.
-        // This finds and uses local dfs service for local read lookkups.
+        // This finds and uses local dfs service for local read lookups.
         Owned<IPropertyTreeIterator> eclWatchServices = getGlobalConfigSP()->getElements("services[@type='dfs']");
         if (!eclWatchServices->first())
             throw makeStringException(-1, "Dfs service not defined in esp services");