summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Sebastien Pedron <jean-sebastien@rabbitmq.com>2014-12-03 14:10:35 +0100
committerJean-Sebastien Pedron <jean-sebastien@rabbitmq.com>2014-12-03 14:10:35 +0100
commit83f42660942a2659c0046cc5e31d04740bd82702 (patch)
treee7ef4da576af413b750f77cbe2d8cce22a3a2a6a
parent5021c61ea8612a5bbedc88c1036a0325db0b1c63 (diff)
downloadrabbitmq-server-git-83f42660942a2659c0046cc5e31d04740bd82702.tar.gz
Filter out auth notification properties with no value
-rw-r--r--src/rabbit_direct.erl2
-rw-r--r--src/rabbit_reader.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_direct.erl b/src/rabbit_direct.erl
index 931e1e4dd7..79c7a19557 100644
--- a/src/rabbit_direct.erl
+++ b/src/rabbit_direct.erl
@@ -100,7 +100,7 @@ notify_auth_result(Username, AuthResult, ExtraProps) ->
EventProps = [{connection_type, direct}] ++
[{name, case Username of none -> ''; _ -> Username end}] ++
ExtraProps,
- rabbit_event:notify(AuthResult, EventProps).
+ rabbit_event:notify(AuthResult, [P || {_, V} = P <- EventProps, V =/= '']).
connect1(User, VHost, Protocol, Pid, Infos) ->
try rabbit_access_control:check_vhost_access(User, VHost, undefined) of
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index 31e60e9a46..0c5f0232c3 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -1127,7 +1127,7 @@ notify_auth_result(Username, AuthResult, ExtraProps, State) ->
end ++
[{name, case Username of none -> ''; _ -> Username end}] ++
ExtraProps,
- rabbit_event:notify(AuthResult, EventProps).
+ rabbit_event:notify(AuthResult, [P || {_, V} = P <- EventProps, V =/= '']).
%%--------------------------------------------------------------------------