diff options
| author | Lukas Larsson <[email protected]> | 2018-08-03 09:49:24 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2018-08-03 09:49:24 +0200 |
| commit | 0ae934aa008f9ff2a929eafc52811fcde619631a (patch) | |
| tree | 938462b708ac6442bb0dda7b99815505503a4d2a /erts/emulator/beam/dist.c | |
| parent | c33d4c7539a1681cfbc024d8637e204c0a05fd1a (diff) | |
| parent | d383549b6e9d9b5e06f23226a61564264204db51 (diff) | |
| download | otp-0ae934aa008f9ff2a929eafc52811fcde619631a.tar.gz otp-0ae934aa008f9ff2a929eafc52811fcde619631a.tar.bz2 otp-0ae934aa008f9ff2a929eafc52811fcde619631a.zip | |
Merge branch 'lukas/erts/seq_trace_fix_token_clear/ERL-602/OTP-15038' into maint
* lukas/erts/seq_trace_fix_token_clear/ERL-602/OTP-15038:
erts: Fix seq_trace to not clear token for system messages
Diffstat (limited to 'erts/emulator/beam/dist.c')
| -rw-r--r-- | erts/emulator/beam/dist.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c index 61090e2c47..146c00b07d 100644 --- a/erts/emulator/beam/dist.c +++ b/erts/emulator/beam/dist.c @@ -3672,6 +3672,7 @@ int erts_auto_connect(DistEntry* dep, Process *proc, ErtsProcLocks proc_locks) dhandle = erts_build_dhandle(&hp, ohp, dep); msg = TUPLE4(hp, am_auto_connect, dep->sysname, make_small(conn_id), dhandle); + ERL_MESSAGE_TOKEN(mp) = am_undefined; erts_queue_proc_message(proc, net_kernel, nk_locks, mp, msg); erts_proc_unlock(net_kernel, nk_locks); } |