diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-09-23 13:26:31 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-09-23 13:26:31 +0100 |
| commit | 4a255a212190f52679e275eb763dd68c1bf87599 (patch) | |
| tree | 7452f91b947c503e9836e45c491803be8eabdca5 | |
| parent | faf896c29e2010c32760b05cdf0a55412808330b (diff) | |
| download | rabbitmq-server-4a255a212190f52679e275eb763dd68c1bf87599.tar.gz | |
Made sure the magic marker message cannot be produced by a client by forcing the guid to be the empty binary
| -rw-r--r-- | src/rabbit_mixed_queue.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_mixed_queue.erl b/src/rabbit_mixed_queue.erl index ddae4da0..74e1da2b 100644 --- a/src/rabbit_mixed_queue.erl +++ b/src/rabbit_mixed_queue.erl @@ -656,7 +656,7 @@ on_disk(mixed, _IsDurable, _IsPersistent) -> false. publish_magic_marker_message(Q) -> Msg = rabbit_basic:message( rabbit_misc:r(<<"/">>, exchange, <<>>), ?MAGIC_MARKER, - [], <<>>, rabbit_guid:guid(), true), + [], <<>>, <<>>, true), ok = rabbit_disk_queue:publish(Q, ensure_binary_properties(Msg), false). fetch_ack_magic_marker_message(Q) -> @@ -665,8 +665,8 @@ fetch_ack_magic_marker_message(Q) -> ok = rabbit_disk_queue:ack(Q, [AckTag]), {ok, Length}. -is_magic_marker_message( - #basic_message { routing_key = ?MAGIC_MARKER, is_persistent = true }) -> +is_magic_marker_message(#basic_message { routing_key = ?MAGIC_MARKER, + is_persistent = true, guid = <<>> }) -> true; is_magic_marker_message(_) -> false. |