From 91f60211efb41d935269edfad7a9c0312b8011d0 Mon Sep 17 00:00:00 2001
From: Peter Andersson <peppe@erlang.org>
Date: Thu, 8 Mar 2012 14:03:46 +0100
Subject: Fix problem with buffered DOWN messages

OTP-9830
---
 lib/common_test/src/ct_util.erl | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'lib/common_test/src/ct_util.erl')

diff --git a/lib/common_test/src/ct_util.erl b/lib/common_test/src/ct_util.erl
index 3b6ad6f98d..e9bfb2590b 100644
--- a/lib/common_test/src/ct_util.erl
+++ b/lib/common_test/src/ct_util.erl
@@ -827,15 +827,20 @@ get_profile_data(Profile, Key, StartDir) ->
 %%%-----------------------------------------------------------------
 %%% Internal functions
 call(Msg) ->
-    MRef = erlang:monitor(process,whereis(ct_util_server)),
-    Ref = make_ref(),
-    ct_util_server ! {Msg,{self(),Ref}},
-    receive
-	{Ref, Result} -> 
-	    erlang:demonitor(MRef, [flush]),
-	    Result;
-	{'DOWN',MRef,process,_,Reason}  -> 
-	    {error,{ct_util_server_down,Reason}}
+    case whereis(ct_util_server) of
+	undefined ->
+	    {error,ct_util_server_not_running};
+	Pid ->
+	    MRef = erlang:monitor(process, Pid),
+	    Ref = make_ref(),
+	    ct_util_server ! {Msg,{self(),Ref}},
+	    receive
+		{Ref, Result} -> 
+		    erlang:demonitor(MRef, [flush]),
+		    Result;
+		{'DOWN',MRef,process,_,Reason}  -> 
+		    {error,{ct_util_server_down,Reason}}
+	    end
     end.
 
 return({To,Ref},Result) ->
-- 
cgit v1.2.3