Browse Source

Merge pull request #6534 from AttilaVamos/HPCC-12300-fix

HPCC-12300 remote copy creates ambiguous xpath

Reviewed-By: Jake Smith <jake.smith@lexisnexis.com> 
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 10 years ago
parent
commit
f0c7781cea
1 changed files with 6 additions and 3 deletions
  1. 6 3
      dali/ft/filecopy.cpp

+ 6 - 3
dali/ft/filecopy.cpp

@@ -1172,13 +1172,16 @@ void FileSprayer::calculateSprayPartition()
     ForEachItemIn(idx2, partitioners)
         partitioners.item(idx2).getResults(partition);
 
-    if (partitioners.ordinality() > 0)
+    if ((partitioners.ordinality() > 0) && !srcAttr->hasProp("ECL"))
     {
         // Store discovered CSV record structure into target logical file.
         StringBuffer recStru;
         partitioners.item(0).getRecordStructure(recStru);
-        IDistributedFile * target = distributedTarget.get();
-        target->setECL(recStru.str());
+        if (recStru.length() > 0)
+        {
+            if (distributedTarget)
+                distributedTarget->setECL(recStru.str());
+        }
     }
 
 }