Merge pull request #16647 from taosdata/fix/avoidExcept
fix(rpc): avoid except
This commit is contained in:
commit
85d7d0a304
|
@ -287,10 +287,10 @@ void transCtxMerge(STransCtx* dst, STransCtx* src) {
|
||||||
STransCtxVal* sVal = (STransCtxVal*)iter;
|
STransCtxVal* sVal = (STransCtxVal*)iter;
|
||||||
key = taosHashGetKey(sVal, &klen);
|
key = taosHashGetKey(sVal, &klen);
|
||||||
|
|
||||||
STransCtxVal* dVal = taosHashGet(dst->args, key, klen);
|
// STransCtxVal* dVal = taosHashGet(dst->args, key, klen);
|
||||||
if (dVal) {
|
// if (dVal) {
|
||||||
dst->freeFunc(dVal->val);
|
// dst->freeFunc(dVal->val);
|
||||||
}
|
// }
|
||||||
taosHashPut(dst->args, key, klen, sVal, sizeof(*sVal));
|
taosHashPut(dst->args, key, klen, sVal, sizeof(*sVal));
|
||||||
iter = taosHashIterate(src->args, iter);
|
iter = taosHashIterate(src->args, iter);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue