瀏覽代碼

Merge pull request #13417 from ghalliday/issue23599

HPCC-23599 Allow the legacy configuration filename to be omitted

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 5 年之前
父節點
當前提交
a6488ab5a6
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      system/jlib/jptree.cpp

+ 1 - 1
system/jlib/jptree.cpp

@@ -7972,7 +7972,7 @@ jlib_decl IPropertyTree * loadConfiguration(const char * defaultYaml, const char
     }
     else
     {
-        if (checkFileExists(legacyFilename))
+        if (legacyFilename && checkFileExists(legacyFilename))
             delta.setown(createPTreeFromXMLFile(legacyFilename, ipt_caseInsensitive));
 
         if (delta && mapper)