mirror of
https://github.com/n8n-io/n8n.git
synced 2025-03-05 20:50:17 -08:00
fix(core): Same version of merge node behaves differently after n8n update (#13106)
Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <aditya@netroy.in>
This commit is contained in:
parent
a4c5334853
commit
df8f059504
|
@ -1489,7 +1489,7 @@ export class WorkflowExecute {
|
||||||
|
|
||||||
nodeSuccessData = runNodeData.data;
|
nodeSuccessData = runNodeData.data;
|
||||||
|
|
||||||
const didContinueOnFail = nodeSuccessData?.at(0)?.at(0)?.json?.error !== undefined;
|
const didContinueOnFail = nodeSuccessData?.[0]?.[0]?.json.error !== undefined;
|
||||||
|
|
||||||
while (didContinueOnFail && tryIndex !== maxTries - 1) {
|
while (didContinueOnFail && tryIndex !== maxTries - 1) {
|
||||||
await sleep(waitBetweenTries);
|
await sleep(waitBetweenTries);
|
||||||
|
@ -1531,7 +1531,7 @@ export class WorkflowExecute {
|
||||||
|
|
||||||
nodeSuccessData = this.assignPairedItems(nodeSuccessData, executionData);
|
nodeSuccessData = this.assignPairedItems(nodeSuccessData, executionData);
|
||||||
|
|
||||||
if (nodeSuccessData === null || nodeSuccessData[0][0] === undefined) {
|
if (!nodeSuccessData?.[0]?.[0]) {
|
||||||
if (executionData.node.alwaysOutputData === true) {
|
if (executionData.node.alwaysOutputData === true) {
|
||||||
const pairedItem: IPairedItemData[] = [];
|
const pairedItem: IPairedItemData[] = [];
|
||||||
|
|
||||||
|
@ -1548,7 +1548,7 @@ export class WorkflowExecute {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
nodeSuccessData = nodeSuccessData || [];
|
nodeSuccessData ??= [];
|
||||||
nodeSuccessData[0] = [
|
nodeSuccessData[0] = [
|
||||||
{
|
{
|
||||||
json: {},
|
json: {},
|
||||||
|
|
Loading…
Reference in a new issue