Skip to content

Commit 43c597b

Browse files
committed
Merge pull request #15416 from JuliaLang/amitm/15046
fix bug during deserialization with fetched Futures
2 parents ec6f886 + f5e4db5 commit 43c597b

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

base/multi.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ end
670670

671671
function deserialize{T<:Future}(s::SerializationState, t::Type{T})
672672
f = deserialize_rr(s,t)
673-
Future(f.where, f.whence, f.id) # ctor adds to ref table
673+
Future(f.where, f.whence, f.id, f.v) # ctor adds to client_refs table
674674
end
675675

676676
function deserialize{T<:RemoteChannel}(s::SerializationState, t::Type{T})

test/parallel_exec.jl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -819,3 +819,8 @@ end
819819

820820
@test t11062() == 2
821821

822+
# issue #15406
823+
v15406 = remotecall_wait(() -> 1, id_other)
824+
fetch(v15406)
825+
remotecall_wait(t -> fetch(t), id_other, v15406)
826+

0 commit comments

Comments
 (0)