Commit 020b158e8650a0f0a70d1fac70c385a48c0fad5f
Committed by
Andrew Shvayka
Andrew Shvayka
1 parent
374cf2a1
Fix merge of alarms
Showing
1 changed file
with
1 additions
and
1 deletions
| @@ -128,7 +128,7 @@ public class TbAlarmDataSubCtx extends TbAbstractDataSubCtx<AlarmDataQuery> { | @@ -128,7 +128,7 @@ public class TbAlarmDataSubCtx extends TbAbstractDataSubCtx<AlarmDataQuery> { | ||
| 128 | } | 128 | } |
| 129 | } | 129 | } |
| 130 | alarmsMap.clear(); | 130 | alarmsMap.clear(); |
| 131 | - alarmsMap.putAll(alarms.getData().stream().collect(Collectors.toMap(AlarmData::getId, Function.identity()))); | 131 | + alarmsMap.putAll(alarms.getData().stream().collect(Collectors.toMap(AlarmData::getId, Function.identity(), (a, b) -> a))); |
| 132 | return this.alarms; | 132 | return this.alarms; |
| 133 | } | 133 | } |
| 134 | 134 |