From bce985be5507eed5643587219dc647ce48a1091c Mon Sep 17 00:00:00 2001 From: Jens Geyer Date: Tue, 30 Aug 2022 22:09:56 +0200 Subject: [PATCH] Revert "Update thrift_socket_transport.erl" This reverts commit 60fef438188958b5439c4d207f1bfa753a218938. --- lib/erl/src/thrift_socket_transport.erl | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/lib/erl/src/thrift_socket_transport.erl b/lib/erl/src/thrift_socket_transport.erl index fe210da977d..fa10ed0c60e 100644 --- a/lib/erl/src/thrift_socket_transport.erl +++ b/lib/erl/src/thrift_socket_transport.erl @@ -70,24 +70,7 @@ when is_integer(Len), Len >= 0 -> X when X >= Len -> {Result, Remaining} = split_binary(Binary, Len), {State#t_socket{buffer = Remaining}, {ok, Result}}; - _ -> - %%recv(State, Len) - loop_recv(State,Len,Len) - end. - -loop_recv(State=#t_socket{buffer = Buf},ReadLen,NextReadLen) when NextReadLen =< 0-> - {Result,Remaining}=split_binary(Buf,ReadLen), - {State#t_socket{buffer = Remaining},{ok,Result}}; - -loop_recv(State=#t_socket{socket = Socket,buffer = Buf},ReadLen,NextReadLen) when NextReadLen >0 -> - case gen_tcp:recv(Socket,0,State#t_socket.recv_timeout) of - {error,Error}-> - gen_tcp:close(Socket), - {State,{error,Error}}; - {ok,Data}-> - Binary=iolist_to_binary([Buf,Data]), - Give=min(iolist_size(Binary),ReadLen), - loop_recv(State#t_socket{buffer = Binary},ReadLen,ReadLen-Give) + _ -> recv(State, Len) end. recv(State = #t_socket{socket = Socket, buffer = Buf}, Len) ->