1 files changed, 18 insertions, 7 deletions
diff --git a/lib/diameter/src/base/diameter_traffic.erl b/lib/diameter/src/base/diameter_traffic.erl
index 280d09d7e8..3b62afca47 100644
--- a/lib/diameter/src/base/diameter_traffic.erl
+++ b/lib/diameter/src/base/diameter_traffic.erl
@@ -1484,7 +1484,7 @@ handle_A(Pkt, SvcName, Dict, Dict0, App, #request{transport = TPid} = Req) ->
             %% a missing AVP. If both are optional in the dictionary
             %% then this isn't a decode error: just continue on.
             answer(Pkt, SvcName, App, Req);
-        exit: {invalid_error_bit, RC} ->
+        exit: {invalid_error_bit, {_, _, _, RC}} ->
             #diameter_packet{errors = Es}
                 = Pkt,
             E = {5004, #diameter_avp{name = 'Result-Code', value = RC}},
@@ -1632,12 +1632,23 @@ send_request(TPid, #diameter_packet{} = Pkt, Req, SvcName, Timeout) ->
 
 %% send/1
 
-send({TPid, Pkt, #request{handler = Pid} = Req, SvcName, Timeout, TRef}) ->
-    Ref = send_request(TPid,
-                       Pkt,
-                       Req#request{handler = self()},
-                       SvcName,
-                       Timeout),
+send({TPid, Pkt, #request{handler = Pid} = Req0, SvcName, Timeout, TRef}) ->
+    Seqs = diameter_codec:sequence_numbers(Pkt),
+    Req = Req0#request{handler = self()},
+    Ref = send_request(TPid, Pkt, Req, SvcName, Timeout),
+
+    try
+        recv(TPid, Pid, TRef, Ref)
+    after
+        %% Remove only the entry for this specific send since a resend
+        %% from the originating node can pick another transport on
+        %% this one.
+        ets:delete_object(?REQUEST_TABLE, {Seqs, Req, Ref})
+    end.
+
+%% recv/4
+
+recv(TPid, Pid, TRef, Ref) ->        
     receive
         {answer, _, _, _, _} = A ->
             Pid ! A;