diff options
| author | Niclas Eklund <[email protected]> | 2010-11-01 10:54:41 +0100 |
|---|---|---|
| committer | Niclas Eklund <[email protected]> | 2010-11-01 10:54:41 +0100 |
| commit | ff182ad7f0b4422f961b4b5336b747cc9f3b2cdf (patch) | |
| tree | 77ec33f4e2b40d8050152ce555160efb06d8f1cf /lib/orber/COSS | |
| parent | 95188ca3a848a1bcb1412d922eb6b13deccf9267 (diff) | |
| parent | 7fce62fb8dfcf964111ce8c3254a41ce450ad0b6 (diff) | |
| download | otp-ff182ad7f0b4422f961b4b5336b747cc9f3b2cdf.tar.gz otp-ff182ad7f0b4422f961b4b5336b747cc9f3b2cdf.tar.bz2 otp-ff182ad7f0b4422f961b4b5336b747cc9f3b2cdf.zip | |
Merge branch 'maint-r14' into dev
Diffstat (limited to 'lib/orber/COSS')
| -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} -> |