瀏覽代碼

Merge pull request #8855 from ghalliday/issue15844

HPCC-15844 Only add linkcounted modifier if not already present

Reviewed-By: Shamser Ahmed <shamser.ahmed@lexisnexis.co.uk>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 9 年之前
父節點
當前提交
dfa1edce84
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      ecl/hqlcpp/hqlinline.cpp

+ 1 - 1
ecl/hqlcpp/hqlinline.cpp

@@ -1365,7 +1365,7 @@ void ParentExtract::gatherActiveRows(BuildCtx & ctx)
                     //child contexts.
                     //child contexts.
                     //Need to add these fields to the extract record, and do the assignments at the point of call
                     //Need to add these fields to the extract record, and do the assignments at the point of call
                     Owned<ITypeInfo> fieldType = makeRowReferenceType(cur.queryDataset());
                     Owned<ITypeInfo> fieldType = makeRowReferenceType(cur.queryDataset());
-                    if (hasOutOfLineModifier(bound->queryType()))
+                    if (hasOutOfLineModifier(bound->queryType()) && !hasLinkCountedModifier(fieldType))
                         fieldType.setown(makeAttributeModifier(LINK(fieldType), getLinkCountedAttr()));
                         fieldType.setown(makeAttributeModifier(LINK(fieldType), getLinkCountedAttr()));
                     expandedAlias.setown(serialization->createField(NULL, fieldType));
                     expandedAlias.setown(serialization->createField(NULL, fieldType));
                     OwnedHqlExpr castSource = createValue(no_implicitcast, LINK(fieldType), LINK(bound));
                     OwnedHqlExpr castSource = createValue(no_implicitcast, LINK(fieldType), LINK(bound));