aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2013-11-05 10:30:48 +0100
committerSverker Eriksson <[email protected]>2013-11-05 10:30:48 +0100
commita528fc366fd2a8b0b01151953e6ee9100a0b996e (patch)
tree909edcab900c0389046f17979539864e5e7d95e3
parentce8be1d7e8d0d3ea15134e441a4d134a63129db6 (diff)
parent00a3dade2d58836bca334be36843775343e5e269 (diff)
downloadotp-a528fc366fd2a8b0b01151953e6ee9100a0b996e.tar.gz
otp-a528fc366fd2a8b0b01151953e6ee9100a0b996e.tar.bz2
otp-a528fc366fd2a8b0b01151953e6ee9100a0b996e.zip
Merge branch 'maint'
-rw-r--r--erts/emulator/beam/dist.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c
index aabccac822..6ecf3f0722 100644
--- a/erts/emulator/beam/dist.c
+++ b/erts/emulator/beam/dist.c
@@ -1509,12 +1509,12 @@ int erts_net_message(Port *prt,
break;
}
rp = erts_pid2proc(NULL, 0, mon->pid, rp_locks);
+
+ erts_destroy_monitor(mon);
if (rp == NULL) {
break;
}
- erts_destroy_monitor(mon);
-
mon = erts_remove_monitor(&ERTS_P_MONITORS(rp), ref);
if (mon == NULL) {