diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2010-07-09 17:19:05 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2010-07-09 17:19:05 +0100 |
| commit | 74290848777c991d4fce71a879139df7f15dcef7 (patch) | |
| tree | c8cc8fb978c497d96775ec9e9a59f205f58b1063 | |
| parent | 9b97df88bd72f2421e60dc9f5202927b49fab26e (diff) | |
| download | rabbitmq-server-74290848777c991d4fce71a879139df7f15dcef7.tar.gz | |
put the 'none' check back into ensure_content_encoded
it's safer and more obviously correct that way
| -rw-r--r-- | src/rabbit_binary_generator.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/rabbit_binary_generator.erl b/src/rabbit_binary_generator.erl index e2c56710..07f25c15 100644 --- a/src/rabbit_binary_generator.erl +++ b/src/rabbit_binary_generator.erl @@ -292,7 +292,9 @@ check_empty_content_body_frame_size() -> ComputedSize, ?EMPTY_CONTENT_BODY_FRAME_SIZE}) end. -ensure_content_encoded(Content = #content{protocol = Protocol}, Protocol) -> +ensure_content_encoded(Content = #content{properties_bin = PropsBin, + protocol = Protocol}, Protocol) + when PropsBin =/= 'none' -> Content; ensure_content_encoded(Content = #content{properties = Props}, Protocol) -> Content#content{properties_bin = Protocol:encode_properties(Props), |