diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-02-02 12:31:28 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-02-02 12:31:28 +0000 |
| commit | cba5108d3b01d12c3a8d74b1a18434534cabab1e (patch) | |
| tree | 0c51baa8769dd4b1f7c837d1c55632058321c5d8 | |
| parent | d507e71ae678271ed15c1a0bdd5b53f1e7fa4479 (diff) | |
| parent | a1dbd1b40dd00c1ff8df39943bb941ec77bdbf4e (diff) | |
| download | rabbitmq-server-cba5108d3b01d12c3a8d74b1a18434534cabab1e.tar.gz | |
Merging bug23735 to default
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | src/rabbit_misc.erl | 6 |
2 files changed, 4 insertions, 3 deletions
@@ -314,3 +314,4 @@ endif ifneq "$(strip $(patsubst clean%,,$(patsubst %clean,,$(TESTABLEGOALS))))" "" -include $(DEPS_FILE) endif + diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index 80c8f4c0..7d916797 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -248,9 +248,9 @@ assert_args_equivalence1(Orig, New, Name, Key) -> val(undefined) -> "none"; val({Type, Value}) -> - Fmt = case Value of - _ when is_binary (Value) -> "a value '~s' of type '~s'"; - _ -> "a value '~w' of type '~s'" + Fmt = case is_binary(Value) of + true -> "the value '~s' of type '~s'"; + false -> "the value '~w' of type '~s'" end, lists:flatten(io_lib:format(Fmt, [Value, Type])). |