Merge pull request #19209 from jakesmith/HPCC-32827-dali-namedmutex

HPCC-32827 Allow Dali to start in BM without a configuration file Reviewed-by: Gavin Halliday <[email protected]> Merged-by: Gavin Halliday <[email protected]>
hpcc-systems · Oct 24, 2024 · 2f4388d · 2f4388d
2 parents aabc919 + 025b31a
commit 2f4388d
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/system/jlib/jmutex.cpp b/system/jlib/jmutex.cpp
@@ -205,14 +205,15 @@ NamedMutex::NamedMutex(const char *name)
         CriticalBlock b(lockPrefixCS);
         if (0 == lockPrefix.length())
         {
-            if (!getConfigurationDirectory(NULL, "lock", NULL, NULL, lockPrefix))
+            if (getConfigurationDirectory(NULL, "lock", NULL, NULL, lockPrefix))
+                addPathSepChar(lockPrefix);
+            else
                 WARNLOG("Failed to get lock directory from environment");
+            lockPrefix.append("JLIBMUTEX_");
         }
-        addPathSepChar(lockPrefix);
-        lockPrefix.append("JLIBMUTEX_");
     }
     StringBuffer tmp(lockPrefix);
-    tmp.append("JLIBMUTEX_").append(name);
+    tmp.append(name);
     mutexfname = tmp.detach();
 }