From c82e9fad33302ff24fdddbd50f110c06d4eb81d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@ninenines.eu>
Date: Fri, 5 Apr 2013 13:06:24 +0200
Subject: Use erlang:demonitor(Ref, [flush]) where applicable

---
 lib/orber/src/orber_iiop_outproxy.erl | 35 +++++++----------------------------
 1 file changed, 7 insertions(+), 28 deletions(-)

(limited to 'lib/orber')

diff --git a/lib/orber/src/orber_iiop_outproxy.erl b/lib/orber/src/orber_iiop_outproxy.erl
index 879af8222d..9c4e603753 100644
--- a/lib/orber/src/orber_iiop_outproxy.erl
+++ b/lib/orber/src/orber_iiop_outproxy.erl
@@ -69,13 +69,8 @@ request(Pid, true, Timeout, Msg, RequestId) ->
     gen_server:cast(Pid, {request, Timeout, Msg, RequestId, self(), MRef}),
     receive
 	{MRef, Reply} ->
-	    erlang:demonitor(MRef),
-            receive 
-                {'DOWN', MRef, _, _, _} -> 
-                    Reply
-            after 0 -> 
-                    Reply
-            end;
+	    erlang:demonitor(MRef, [flush]),
+            Reply;
 	{'DOWN', MRef, _, Pid, _Reason} when is_pid(Pid) ->
             receive
 		%% Clear EXIT message from queue
@@ -444,13 +439,7 @@ collect_fragments(GIOPHdr1, InBuffer, Bytes, Proxy, RequestId, MRef) ->
 	%% the reply and send it to the client.
 	{fragment, #giop_message{byte_order = ByteOrder,
 				 message    = Message} = GIOPHdr2, RequestId, MRef} ->
-	    erlang:demonitor(MRef),
-            receive 
-                {'DOWN', MRef, _, _, _} -> 
-		    ok
-            after 0 -> 
-		    ok
-            end,
+	    erlang:demonitor(MRef, [flush]),
 	    case catch cdr_decode:dec_message_header(null, GIOPHdr2, Message) of
 		{_, #fragment_header{}, FragBody, _, _} ->
 		    %% This buffer is all the fragments concatenated.
@@ -484,13 +473,8 @@ Unable to decode Reply or LocateReply header",[?LINE, NewGIOP, Error], ?DEBUG_LE
 	{MRef, {'EXCEPTION', E}} ->
 	    orber:dbg("[~p] orber_iiop:collect_fragments(~p);", 
 		      [?LINE, E], ?DEBUG_LEVEL),
-	    erlang:demonitor(MRef),
-            receive 
-                {'DOWN', MRef, _, _, _} -> 
-		    corba:raise(E)
-            after 0 -> 
-		    corba:raise(E)
-            end;
+	    erlang:demonitor(MRef, [flush]),
+            corba:raise(E);
 	{'DOWN', MRef, _, Proxy, Reason} when is_pid(Proxy) ->
 	    orber:dbg("[~p] orber_iiop:collect_fragments(~p);~n"
 		      "Monitor generated a DOWN message.", 
@@ -511,13 +495,8 @@ clear_queue(Proxy, RequestId, MRef) ->
 	{MRef, RequestId, cancelled} ->
 	    %% This is the last message that the proxy will send
 	    %% after we've cancelled the request.
-	    erlang:demonitor(MRef),
-	    receive 
-		{'DOWN', MRef, _, _, _} -> 
-		    ok
-	    after 0 -> 
-		    ok
-	    end;
+	    erlang:demonitor(MRef, [flush]),
+	    ok;
 	{'DOWN', MRef, _, Proxy, _Reason} ->
 	    %% The proxy terminated. Clear EXIT message from queue
             receive
-- 
cgit v1.2.3