Commit 150abf1
fix: 修复 Fork.join() 并发场景下的 null 数据处理 (#247)
问题根因:在并发场景下,Fork.join() 的 reducer 接收到 input.getData() = null,
导致 NPE 或数据丢失("Required parameters are missing")。
修复方案(阶段1):
- Fork.java: 添加智能 null 处理,跳过 null 分支避免崩溃
- 使用 Logger.warn() 记录异常情况,便于监控
- 清理所有 System.err 诊断代码
- Tip.merge(): 保留防御性 null 检查
技术细节:
- 当 inputData 为 null 时,记录警告日志并跳过此分支
- 如果是最后一个分支,返回已有数据(避免整个流程失败)
- 保留 Tip.merge() 的 null 检查作为额外防御层
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>1 parent a8d9b99 commit 150abf1
File tree
3 files changed
+22
-51
lines changed- framework
- fel/java
- fel-core/src/main/java/modelengine/fel/core/util
- fel-flow/src/main/java/modelengine/fel/engine/activities
- waterflow/java/waterflow-core/src/main/java/modelengine/fit/waterflow/domain/states
3 files changed
+22
-51
lines changedLines changed: 2 additions & 22 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
118 | 118 | | |
119 | 119 | | |
120 | 120 | | |
121 | | - | |
122 | | - | |
123 | | - | |
124 | | - | |
125 | | - | |
126 | | - | |
127 | | - | |
128 | | - | |
| 121 | + | |
129 | 122 | | |
130 | | - | |
131 | | - | |
132 | | - | |
133 | | - | |
134 | 123 | | |
135 | 124 | | |
136 | | - | |
137 | | - | |
138 | | - | |
139 | | - | |
140 | | - | |
141 | | - | |
142 | | - | |
143 | | - | |
144 | | - | |
145 | | - | |
| 125 | + | |
146 | 126 | | |
147 | 127 | | |
148 | 128 | | |
| |||
Lines changed: 1 addition & 17 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
594 | 594 | | |
595 | 595 | | |
596 | 596 | | |
597 | | - | |
598 | | - | |
599 | | - | |
600 | | - | |
601 | | - | |
602 | | - | |
603 | | - | |
604 | | - | |
605 | | - | |
606 | | - | |
607 | | - | |
608 | | - | |
609 | | - | |
610 | | - | |
611 | | - | |
612 | | - | |
613 | | - | |
| 597 | + | |
614 | 598 | | |
615 | 599 | | |
616 | 600 | | |
| |||
Lines changed: 19 additions & 12 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| 15 | + | |
15 | 16 | | |
16 | 17 | | |
17 | 18 | | |
| |||
33 | 34 | | |
34 | 35 | | |
35 | 36 | | |
| 37 | + | |
| 38 | + | |
36 | 39 | | |
37 | 40 | | |
38 | 41 | | |
| |||
94 | 97 | | |
95 | 98 | | |
96 | 99 | | |
97 | | - | |
| 100 | + | |
| 101 | + | |
98 | 102 | | |
99 | | - | |
100 | | - | |
101 | | - | |
102 | | - | |
103 | | - | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
104 | 108 | | |
105 | | - | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
106 | 117 | | |
107 | | - | |
108 | | - | |
109 | | - | |
110 | | - | |
111 | | - | |
| 118 | + | |
112 | 119 | | |
113 | 120 | | |
114 | 121 | | |
| |||
0 commit comments