Skip to content

Commit c105655

Browse files
committed
Fix test server merge
1 parent d8f61d5 commit c105655

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

temporal-test-server/src/main/java/io/temporal/internal/testservice/StateMachines.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2563,9 +2563,17 @@ static Priority mergePriorities(Priority parent, Priority child) {
25632563
}
25642564
Priority.Builder result = Priority.newBuilder();
25652565
result.setPriorityKey(parent.getPriorityKey());
2566+
result.setFairnessKey(child.getFairnessKey());
2567+
result.setFairnessWeight(child.getFairnessWeight());
25662568
if (child.getPriorityKey() != 0) {
25672569
result.setPriorityKey(child.getPriorityKey());
25682570
}
2571+
if (!child.getFairnessKey().isEmpty()) {
2572+
result.setFairnessKey(child.getFairnessKey());
2573+
}
2574+
if (child.getFairnessWeight() != 0) {
2575+
result.setFairnessWeight(child.getFairnessWeight());
2576+
}
25692577
return result.build();
25702578
}
25712579
}

0 commit comments

Comments
 (0)