diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2006-12-07 02:56:14 +0000 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2006-12-07 02:56:14 +0000 |
| commit | e9047f4b31a0f8d91495ee4c60f9cac10f54adcc (patch) | |
| tree | 48810c8eec0b79a9620a0996d8e3959cdd63405a /src | |
| parent | * src/ejabberd_loglevel.erl: Preliminary dynamic loglevel support. (diff) | |
* src/mod_roster_odbc.erl: Better error handling
* src/web/ejabberd_http_poll.erl: Minor fix
SVN Revision: 690
Diffstat (limited to 'src')
| -rw-r--r-- | src/mod_roster_odbc.erl | 14 | ||||
| -rw-r--r-- | src/web/ejabberd_http_poll.erl | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/mod_roster_odbc.erl b/src/mod_roster_odbc.erl index 9509cc68c..d36dfecda 100644 --- a/src/mod_roster_odbc.erl +++ b/src/mod_roster_odbc.erl @@ -702,11 +702,15 @@ get_in_pending_subscriptions(Ls, User, Server) -> end, lists:flatmap( fun(I) -> - R = raw_to_record(LServer, I), - case R#roster.ask of - in -> [R]; - both -> [R]; - _ -> [] + case raw_to_record(LServer, I) of + error -> + []; + R -> + case R#roster.ask of + in -> [R]; + both -> [R]; + _ -> [] + end end end, Items)); diff --git a/src/web/ejabberd_http_poll.erl b/src/web/ejabberd_http_poll.erl index a73fca743..d12277449 100644 --- a/src/web/ejabberd_http_poll.erl +++ b/src/web/ejabberd_http_poll.erl @@ -305,7 +305,7 @@ terminate(Reason, StateName, StateData) -> {Receiver, _Tag} -> Receiver ! {tcp_closed, {http_poll, self()}} end, - resend_messages(StateData#state.output), + catch resend_messages(StateData#state.output), ok. %%%---------------------------------------------------------------------- |