summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_access_control.erl7
-rw-r--r--src/rabbit_exchange_type_topic.erl2
2 files changed, 4 insertions, 5 deletions
diff --git a/src/rabbit_access_control.erl b/src/rabbit_access_control.erl
index 9590d38080..f9e98094bb 100644
--- a/src/rabbit_access_control.erl
+++ b/src/rabbit_access_control.erl
@@ -174,10 +174,9 @@ check_resource_access(Username,
[#user_permission{permission = P}] ->
case re:run(
binary_to_list(Name),
- binary_to_list(element(permission_index(Permission), P)),
- [{return, list}]) of
- {match, _, _} -> true;
- nomatch -> false
+ binary_to_list(element(permission_index(Permission), P))) of
+ {match, _} -> true;
+ nomatch -> false
end
end,
if Res -> ok;
diff --git a/src/rabbit_exchange_type_topic.erl b/src/rabbit_exchange_type_topic.erl
index ae6b20eb16..53f36cde83 100644
--- a/src/rabbit_exchange_type_topic.erl
+++ b/src/rabbit_exchange_type_topic.erl
@@ -67,7 +67,7 @@ publish(#exchange{name = Name}, Delivery =
Delivery).
split_topic_key(Key) ->
- KeySplit = re:split(binary_to_list(Key), "\\.", [{return, list}]),
+ KeySplit = re:split(Key, "\\.", [{return, list}]),
KeySplit.
topic_matches(PatternKey, RoutingKey) ->