From 5194bb9f0a8fd058f701703e06f2b9be3dce9a91 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas.larsson@erlang-solutions.com>
Date: Wed, 24 Feb 2016 16:18:51 +0100
Subject: erts: Fix end_per_testcase crash in local_trace_SUITE

---
 erts/emulator/test/trace_local_SUITE.erl | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'erts')

diff --git a/erts/emulator/test/trace_local_SUITE.erl b/erts/emulator/test/trace_local_SUITE.erl
index 8901beebca..74c05f24e0 100644
--- a/erts/emulator/test/trace_local_SUITE.erl
+++ b/erts/emulator/test/trace_local_SUITE.erl
@@ -1224,18 +1224,22 @@ setup(ProcFlags) ->
 
 shutdown() ->
     trace_off(),
-    {Pid,Mref} = get(slave),
-    try erlang:is_process_alive(Pid) of
-        true ->
-            Pid ! die,
-            receive
-                {'DOWN',Mref,process,Pid,Reason} ->
-                    Reason
+    case get(slave) of
+        {Pid,Mref} ->
+            try erlang:is_process_alive(Pid) of
+                true ->
+                    Pid ! die,
+                    receive
+                        {'DOWN',Mref,process,Pid,Reason} ->
+                            Reason
+                    end;
+                _ ->
+                    not_alive
+            catch _:_ ->
+                    undefined
             end;
         _ ->
-            not_alive
-    catch _:_ ->
-              undefined
+            undefined
     end.
 
 trace_off() ->
-- 
cgit v1.2.3