Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-28 16:34:13 +01:00
Code Releases Activity

* src/mod_roster_odbc.erl: Better error handling

Browse Source 
* src/web/ejabberd_http_poll.erl: Minor fix

SVN Revision: 690
This commit is contained in:
Alexey Shchepin 2006-12-07 02:56:14 +00:00
parent beb3a450f0
commit e9047f4b31
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-12-05 Alexey Shchepin <alexey@sevcom.net>
* src/mod_roster_odbc.erl: Better error handling
* src/web/ejabberd_http_poll.erl: Minor fix
2006-12-04 Mickael Remond <mickael.remond@process-one.net> 2006-12-04 Mickael Remond <mickael.remond@process-one.net>
* src/ejabberd_loglevel.erl: Preliminary dynamic loglevel support. * src/ejabberd_loglevel.erl: Preliminary dynamic loglevel support.

14
src/mod_roster_odbc.erl
View File

@ -702,11 +702,15 @@ get_in_pending_subscriptions(Ls, User, Server) ->
end, end,
lists:flatmap( lists:flatmap(
fun(I) -> fun(I) ->
R = raw_to_record(LServer, I), case raw_to_record(LServer, I) of
case R#roster.ask of error ->
in -> [R]; [];
both -> [R]; R ->
_ -> [] case R#roster.ask of
in -> [R];
both -> [R];
_ -> []
end
end end
end, end,
Items)); Items));

2
src/web/ejabberd_http_poll.erl
View File

@ -305,7 +305,7 @@ terminate(Reason, StateName, StateData) ->
{Receiver, _Tag} -> {Receiver, _Tag} ->
Receiver ! {tcp_closed, {http_poll, self()}} Receiver ! {tcp_closed, {http_poll, self()}}
end, end,
resend_messages(StateData#state.output), catch resend_messages(StateData#state.output),
ok. ok.
%%%---------------------------------------------------------------------- %%%----------------------------------------------------------------------