HPCC-23894 Core looking up subfile info where not present

Signed-off-by: Richard Chapman <[email protected]>
corner4world · Apr 23, 2020 · 0936a70 · 0936a70
1 parent daa0afb
commit 0936a70
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/dali/base/dadfs.cpp b/dali/base/dadfs.cpp
@@ -5118,7 +5118,6 @@ class CDistributedSuperFile: public CDistributedFileBase<IDistributedSuperFile>
                 subfile.setown(transaction?transaction->lookupFile(subname.str(),timeout):parent->lookup(subname.str(), udesc, false, false, false, transaction, defaultPrivilegedUser, timeout));
                 if (!subfile.get())
                     subfile.setown(transaction?transaction->lookupSuperFile(subname.str(),timeout):parent->lookupSuperFile(subname.str(),udesc,transaction,timeout));
-                containsRestrictedSubfile = containsRestrictedSubfile || subfile->isRestrictedAccess();
                 // Some files are ok not to exist
                 if (!subfile.get())
                 {
@@ -5140,6 +5139,8 @@ class CDistributedSuperFile: public CDistributedFileBase<IDistributedSuperFile>
                     else
                         ThrowStringException(-1, "CDistributedSuperFile: SuperFile %s: corrupt subfile file '%s' cannot be found", logicalName.get(), subname.str());
                 }
+                if (subfile.get())
+                    containsRestrictedSubfile = containsRestrictedSubfile || subfile->isRestrictedAccess();
                 subfiles.append(*subfile.getClear());
                 if (link)
                     linkSubFile(f);