diff options
| author | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-02-07 15:13:48 +0000 |
|---|---|---|
| committer | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-02-07 15:13:48 +0000 |
| commit | b19872da69e42922c0ec95f07022b78dd367f7c0 (patch) | |
| tree | accd32707f28f60bb2a845d81e1a587cbe9456fa /src/rabbit_variable_queue.erl | |
| parent | 2fdee97e0f1cad03faf1827eb6f43ec78c1d3e1f (diff) | |
| parent | a8420cfc3361ccc308f8ff4ae9d7289fd62614e0 (diff) | |
| download | rabbitmq-server-b19872da69e42922c0ec95f07022b78dd367f7c0.tar.gz | |
Merged default.
Diffstat (limited to 'src/rabbit_variable_queue.erl')
| -rw-r--r-- | src/rabbit_variable_queue.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index ea7f0c78..52eb168a 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -434,7 +434,7 @@ init(#amqqueue { name = QueueName, durable = true }, true, Terms = rabbit_queue_index:shutdown_terms(QueueName), {PRef, Terms1} = case proplists:get_value(persistent_ref, Terms) of - undefined -> {rabbit_guid:guid(), []}; + undefined -> {rabbit_guid:gen(), []}; PRef1 -> {PRef1, Terms} end, PersistentClient = msg_store_client_init(?PERSISTENT_MSG_STORE, PRef, @@ -860,7 +860,8 @@ with_immutable_msg_store_state(MSCState, IsPersistent, Fun) -> Res. msg_store_client_init(MsgStore, MsgOnDiskFun, Callback) -> - msg_store_client_init(MsgStore, rabbit_guid:guid(), MsgOnDiskFun, Callback). + msg_store_client_init(MsgStore, rabbit_guid:gen(), MsgOnDiskFun, + Callback). msg_store_client_init(MsgStore, Ref, MsgOnDiskFun, Callback) -> CloseFDsFun = msg_store_close_fds_fun(MsgStore =:= ?PERSISTENT_MSG_STORE), |