Skip to content

Commit 9e40f92

Browse files
committed
fixup! haha regexps
1 parent 9ec793c commit 9e40f92

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

deps/rabbitmq_stomp/src/rabbit_stomp_processor.erl

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1736,13 +1736,17 @@ parse_endpoint(undefined) ->
17361736
parse_endpoint(Destination) when is_binary(Destination) ->
17371737
parse_endpoint(unicode:characters_to_list(Destination));
17381738
parse_endpoint(Destination) when is_list(Destination) ->
1739-
case re:split(Destination, "/", [{return, list}]) of
1739+
case string:split(Destination, "/", all) of
17401740
[Name] ->
17411741
{ok, {queue, unescape(Name)}};
1742-
["", Type | Rest]
1743-
when Type =:= "exchange" orelse Type =:= "queue" orelse
1744-
Type =:= "topic" orelse Type =:= "temp-queue" ->
1745-
parse_endpoint0(atomise(Type), Rest);
1742+
["", "exchange" | Rest] ->
1743+
parse_endpoint0(exchange, Rest);
1744+
["", "queue" | Rest] ->
1745+
parse_endpoint0(queue, Rest);
1746+
["", "topic" | Rest] ->
1747+
parse_endpoint0(topic, Rest);
1748+
["", "temp-queue" | Rest] ->
1749+
parse_endpoint0(temp_queue, Rest);
17461750
["", "amq", "queue" | Rest] ->
17471751
parse_endpoint0(amqqueue, Rest);
17481752
["", "reply-queue" = Prefix | [_|_]] ->
@@ -1869,9 +1873,6 @@ new_amqqueue(QNameBin0, Type, Params0, _State = #proc_state{user = #user{usernam
18691873
to_url([]) -> [];
18701874
to_url(Lol) -> "/" ++ string:join(Lol, "/").
18711875

1872-
atomise(Name) when is_list(Name) ->
1873-
list_to_atom(re:replace(Name, "-", "_", [{return,list}, global])).
1874-
18751876
unescape(Str) -> unescape(Str, []).
18761877

18771878
unescape("%2F" ++ Str, Acc) -> unescape(Str, [$/ | Acc]);

0 commit comments

Comments
 (0)