diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2011-03-31 12:07:17 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2011-03-31 12:07:17 +0100 |
| commit | a2b490f317fa76876fa26339502c09f6ba1b0cba (patch) | |
| tree | 93f9047eb6e6dfc2a6fc64befe9cefb8ff64c253 | |
| parent | 197b263d384d5344ea03feacd29b2430da807d5a (diff) | |
| download | rabbitmq-server-git-a2b490f317fa76876fa26339502c09f6ba1b0cba.tar.gz | |
Don't transform markers when upgrading messages
| -rw-r--r-- | src/rabbit_msg_store.erl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl index bb26de64a3..9b8ddae0d0 100644 --- a/src/rabbit_msg_store.erl +++ b/src/rabbit_msg_store.erl @@ -2007,7 +2007,10 @@ transform_msg_file(FileOld, FileNew, TransformFun) -> rabbit_msg_file:scan( RefOld, filelib:file_size(FileOld), fun({MsgId, _Size, _Offset, BinMsg}, ok) -> - {ok, MsgNew} = TransformFun(binary_to_term(BinMsg)), + {ok, MsgNew} = case binary_to_term(BinMsg) of + <<>> -> {ok, <<>>}; %% dying client marker + Msg -> TransformFun(Msg) + end, {ok, _} = rabbit_msg_file:append(RefNew, MsgId, MsgNew), ok end, ok), |