diff options
| author | Christophe Romain <christophe.romain@process-one.net> | 2009-08-28 16:24:42 +0000 |
|---|---|---|
| committer | Christophe Romain <christophe.romain@process-one.net> | 2009-08-28 16:24:42 +0000 |
| commit | fdc6149c08a9a97b327d37471b2aa55be2178494 (patch) | |
| tree | 17487f72c56c4e210df0e5824f13c4a7ba445192 | |
| parent | secure calls to ets:lookup (diff) | |
apply last patch to pubsub_odbc as well
SVN Revision: 2563
| -rw-r--r-- | src/mod_pubsub/mod_pubsub_odbc.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mod_pubsub/mod_pubsub_odbc.erl b/src/mod_pubsub/mod_pubsub_odbc.erl index 5bf196df..046066e7 100644 --- a/src/mod_pubsub/mod_pubsub_odbc.erl +++ b/src/mod_pubsub/mod_pubsub_odbc.erl @@ -3257,7 +3257,7 @@ set_xoption([_ | Opts], NewOpts) -> is_last_item_cache_enabled({_, ServerHost, _}) -> is_last_item_cache_enabled(ServerHost); is_last_item_cache_enabled(Host) -> - case ets:lookup(gen_mod:get_module_proc(Host, config), last_item_cache) of + case catch ets:lookup(gen_mod:get_module_proc(Host, config), last_item_cache) of [{last_item_cache, true}] -> true; _ -> false end. @@ -3281,7 +3281,7 @@ get_cached_item({_, ServerHost, _}, NodeId) -> get_cached_item(Host, NodeId) -> case is_last_item_cache_enabled(Host) of true -> - case ets:lookup(gen_mod:get_module_proc(Host, last_items), NodeId) of + case catch ets:lookup(gen_mod:get_module_proc(Host, last_items), NodeId) of [{NodeId, {ItemId, Payload}}] -> #pubsub_item{itemid = {ItemId, NodeId}, payload = Payload}; _ -> @@ -3294,7 +3294,7 @@ get_cached_item(Host, NodeId) -> %%%% plugin handling plugins(Host) -> - case ets:lookup(gen_mod:get_module_proc(Host, config), plugins) of + case catch ets:lookup(gen_mod:get_module_proc(Host, config), plugins) of [{plugins, []}] -> [?STDNODE]; [{plugins, PL}] -> PL; _ -> [?STDNODE] @@ -3302,7 +3302,7 @@ plugins(Host) -> select_type(ServerHost, Host, Node, Type)-> SelectedType = case Host of {_User, _Server, _Resource} -> - case ets:lookup(gen_mod:get_module_proc(ServerHost, config), pep_mapping) of + case catch ets:lookup(gen_mod:get_module_proc(ServerHost, config), pep_mapping) of [{pep_mapping, PM}] -> proplists:get_value(Node, PM, ?PEPNODE); _ -> ?PEPNODE end; @@ -3385,7 +3385,7 @@ tree_call({_User, Server, _Resource}, Function, Args) -> tree_call(Server, Function, Args); tree_call(Host, Function, Args) -> ?DEBUG("tree_call ~p ~p ~p",[Host, Function, Args]), - Module = case ets:lookup(gen_mod:get_module_proc(Host, config), nodetree) of + Module = case catch ets:lookup(gen_mod:get_module_proc(Host, config), nodetree) of [{nodetree, N}] -> N; _ -> list_to_atom(?TREE_PREFIX ++ ?STDTREE) end, |