diff options
| author | Niclas Eklund <[email protected]> | 2010-12-10 17:00:02 +0100 |
|---|---|---|
| committer | Niclas Eklund <[email protected]> | 2010-12-10 17:00:02 +0100 |
| commit | 8bd0325c850ad70e514f680a2dd7020144773665 (patch) | |
| tree | 9d8ad2b52391cb54db7fef5c84d0b519c1d48c34 /lib/orber/COSS/CosNaming/orber_cosnaming_utils.erl | |
| parent | 3cf40cefd44ab6383bd16319c7c6941fd0d0f13c (diff) | |
| parent | caa311d4a2b5fb229d9369c7667b062b34945b36 (diff) | |
| download | otp-8bd0325c850ad70e514f680a2dd7020144773665.tar.gz otp-8bd0325c850ad70e514f680a2dd7020144773665.tar.bz2 otp-8bd0325c850ad70e514f680a2dd7020144773665.zip | |
Merge branch 'maint-r13' of super:otp into nick/orber/recursive_types/OTP-8868
Diffstat (limited to 'lib/orber/COSS/CosNaming/orber_cosnaming_utils.erl')
| -rw-r--r-- | lib/orber/COSS/CosNaming/orber_cosnaming_utils.erl | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/orber/COSS/CosNaming/orber_cosnaming_utils.erl b/lib/orber/COSS/CosNaming/orber_cosnaming_utils.erl index 7792839e22..768653c898 100644 --- a/lib/orber/COSS/CosNaming/orber_cosnaming_utils.erl +++ b/lib/orber/COSS/CosNaming/orber_cosnaming_utils.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2009. All Rights Reserved. +%% Copyright Ericsson AB 1999-2010. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -536,8 +536,15 @@ lookup(_, _Ctx) -> receive_msg(Socket, Acc, Timeout) -> receive {tcp_closed, Socket} -> - [_Header, Body] = re:split(Acc,"\r\n\r\n",[{return,list}]), - Body; + case re:split(Acc,"\r\n\r\n",[{return,list}]) of + [_Header, Body] -> + Body; + What -> + orber:dbg("[~p] orber_cosnaming_utils:receive_msg();~n" + "HTTP server closed the connection before sending a complete reply: ~p.", + [?LINE, What], ?DEBUG_LEVEL), + corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_NO}) + end; {tcp, Socket, Response} -> receive_msg(Socket, Acc ++ Response, Timeout); {tcp_error, Socket, Reason} -> |