Author: dreiss
Date: Tue Jun 10 18:02:55 2008
New Revision: 666455
URL: http://svn.apache.org/viewvc?rev=666455&view=rev
Log:
testing return of empty binary from 0-length thrrift read
Modified:
incubator/thrift/trunk/lib/alterl/src/thrift_binary_protocol.erl
incubator/thrift/trunk/lib/alterl/src/thrift_socket_server.erl
Modified: incubator/thrift/trunk/lib/alterl/src/thrift_binary_protocol.erl
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/alterl/src/thrift_binary_protocol.erl?rev=666455&r1=666454&r2=666455&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/alterl/src/thrift_binary_protocol.erl (original)
+++ incubator/thrift/trunk/lib/alterl/src/thrift_binary_protocol.erl Tue Jun 10
18:02:55 2008
@@ -269,5 +269,6 @@
{ok, Sz} = read(This, i32),
{ok, Bin} = read(This, Sz);
+read(This, 0) -> {ok, <<>>};
read(This, Len) when is_integer(Len), Len >= 0 ->
thrift_transport:read(This#binary_protocol.transport, Len).
Modified: incubator/thrift/trunk/lib/alterl/src/thrift_socket_server.erl
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/alterl/src/thrift_socket_server.erl?rev=666455&r1=666454&r2=666455&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/alterl/src/thrift_socket_server.erl (original)
+++ incubator/thrift/trunk/lib/alterl/src/thrift_socket_server.erl Tue Jun 10
18:02:55 2008
@@ -103,7 +103,7 @@
end.
init(State=#thrift_socket_server{ip=Ip, port=Port}) ->
- process_flag(trap_exit, true), %% only temporary
+ process_flag(trap_exit, true),
BaseOpts = [binary,
{reuseaddr, true},
{packet, 0},
@@ -165,7 +165,7 @@
acceptor_loop({Server, Listen, Service, Handler, SocketOpts})
when is_pid(Server), is_list(SocketOpts) ->
- case catch gen_tcp:accept(Listen) of % infiinite timeout
+ case catch gen_tcp:accept(Listen) of % infinite timeout
{ok, Socket} ->
gen_server:cast(Server, {accepted, self()}),
ProtoGen = fun() ->
