Pārlūkot izejas kodu

HPCC-11563 Don't set RefFileNotFound for ReferencedFiles in packagemap

Signed-off-by: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>
Anthony Fishbeck 11 gadi atpakaļ
vecāks
revīzija
ce8ca2af44
1 mainītis faili ar 6 papildinājumiem un 2 dzēšanām
  1. 6 2
      common/workunit/referencedfilelist.cpp

+ 6 - 2
common/workunit/referencedfilelist.cpp

@@ -289,7 +289,9 @@ void ReferencedFile::processRemoteFileTree(IPropertyTree *tree, const char *srcC
 
 
 void ReferencedFile::resolveLocal(const char *dstCluster, const char *srcCluster, IUserDescriptor *user, StringArray *subfiles)
 void ReferencedFile::resolveLocal(const char *dstCluster, const char *srcCluster, IUserDescriptor *user, StringArray *subfiles)
 {
 {
-    if (noDfsResolution || (flags & RefFileInPackage))
+    if (flags & RefFileInPackage)
+        return;
+    if (noDfsResolution)
     {
     {
         flags |= RefFileNotFound;
         flags |= RefFileNotFound;
         return;
         return;
@@ -335,7 +337,9 @@ void ReferencedFile::resolveRemote(IUserDescriptor *user, INode *remote, const c
 {
 {
     if ((flags & RefFileForeign) && !resolveForeign)
     if ((flags & RefFileForeign) && !resolveForeign)
         return;
         return;
-    if (noDfsResolution || (flags & RefFileInPackage))
+    if (flags & RefFileInPackage)
+        return;
+    if (noDfsResolution)
     {
     {
         flags |= RefFileNotFound;
         flags |= RefFileNotFound;
         return;
         return;