diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2010-02-20 20:05:48 +0900 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2010-02-20 20:05:48 +0900 |
| commit | f60804b060d1aaa9938514fd947daf6a5a5f607b (patch) | |
| tree | bc8ec25113313da3e5eac6d7ed4ba709c1cc1713 | |
| parent | now using mnesia:async_dirty when cleaning table from failed node (diff) | |
get rid of queue:filter/2 to keep compatibility with older Erlang versions
| -rw-r--r-- | src/odbc/ejabberd_odbc.erl | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/odbc/ejabberd_odbc.erl b/src/odbc/ejabberd_odbc.erl index de38260c4..64de686cb 100644 --- a/src/odbc/ejabberd_odbc.erl +++ b/src/odbc/ejabberd_odbc.erl @@ -194,11 +194,10 @@ connecting(connect, #state{host = Host} = State) -> case ConnectRes of {ok, Ref} -> erlang:monitor(process, Ref), - queue:filter( + lists:foreach( fun(Req) -> - ?GEN_FSM:send_event(self(), Req), - false - end, PendingRequests), + ?GEN_FSM:send_event(self(), Req) + end, queue:to_list(PendingRequests)), {next_state, session_established, State#state{db_ref = Ref, pending_requests = {0, queue:new()}}}; @@ -226,12 +225,11 @@ connecting({sql_cmd, Command} = Req, From, State) -> if Len < State#state.max_pending_requests_len -> {Len + 1, queue:in({sql_cmd, Command, From}, PendingRequests)}; true -> - queue:filter( + lists:foreach( fun({sql_cmd, _, To}) -> - ?GEN_FSM:reply(To, - {error, "SQL connection failed"}), - false - end, PendingRequests), + ?GEN_FSM:reply( + To, {error, "SQL connection failed"}) + end, queue:to_list(PendingRequests)), {1, queue:from_list([{sql_cmd, Command, From}])} end, {next_state, connecting, |