From 24afead423bdaf28760839effbd643a3017f1300 Mon Sep 17 00:00:00 2001 From: Christophe Romain Date: Fri, 25 Sep 2009 12:48:10 +0000 Subject: [PATCH] fix EJAB-1054 (thanks to Evgeniy Khramtsov) SVN Revision: 2633 --- src/mod_caps.erl | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/mod_caps.erl b/src/mod_caps.erl index 6614160c3..1ac6bbd92 100644 --- a/src/mod_caps.erl +++ b/src/mod_caps.erl @@ -140,15 +140,8 @@ get_user_resources(U, S) -> %% information. Host is the host that asks, From is the full JID that %% sent the caps packet, and Caps is what read_caps returned. note_caps(Host, From, Caps) -> - case Caps of - nothing -> - BJID = exmpp_jid:to_binary(From), - catch mnesia:dirty_delete({user_caps, BJID}), - ok; - _ -> - Proc = gen_mod:get_module_proc(Host, ?PROCNAME), - gen_server:cast(Proc, {note_caps, From, Caps}) - end. + Proc = gen_mod:get_module_proc(Host, ?PROCNAME), + gen_server:cast(Proc, {note_caps, From, Caps}). %% wait_caps should be called just before note_caps %% it allows to lock get_caps usage for code using presence_probe @@ -310,6 +303,10 @@ handle_call({get_features, Caps}, From, State) -> handle_call(stop, _From, State) -> {stop, normal, ok, State}. +handle_cast({note_caps, From, nothing}, State) -> + BJID = exmpp_jid:to_binary(From), + catch mnesia:dirty_delete({user_caps, BJID}), + {noreply, State}; handle_cast({note_caps, From, #caps{node = Node, version = Version, exts = Exts} = Caps}, #state{host = Host, disco_requests = Requests} = State) ->