Skip to content

Commit a3712db

Browse files
committed
fixup! haha regexps
1 parent 1fd50e6 commit a3712db

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
@@ -1769,13 +1769,17 @@ parse_endpoint(undefined) ->
17691769
parse_endpoint(Destination) when is_binary(Destination) ->
17701770
parse_endpoint(unicode:characters_to_list(Destination));
17711771
parse_endpoint(Destination) when is_list(Destination) ->
1772-
case re:split(Destination, "/", [{return, list}]) of
1772+
case string:split(Destination, "/", all) of
17731773
[Name] ->
17741774
{ok, {queue, unescape(Name)}};
1775-
["", Type | Rest]
1776-
when Type =:= "exchange" orelse Type =:= "queue" orelse
1777-
Type =:= "topic" orelse Type =:= "temp-queue" ->
1778-
parse_endpoint0(atomise(Type), Rest);
1775+
["", "exchange" | Rest] ->
1776+
parse_endpoint0(exchange, Rest);
1777+
["", "queue" | Rest] ->
1778+
parse_endpoint0(queue, Rest);
1779+
["", "topic" | Rest] ->
1780+
parse_endpoint0(topic, Rest);
1781+
["", "temp-queue" | Rest] ->
1782+
parse_endpoint0(temp_queue, Rest);
17791783
["", "amq", "queue" | Rest] ->
17801784
parse_endpoint0(amqqueue, Rest);
17811785
["", "reply-queue" = Prefix | [_|_]] ->
@@ -1902,9 +1906,6 @@ new_amqqueue(QNameBin0, Type, Params0, _State = #proc_state{user = #user{usernam
19021906
to_url([]) -> [];
19031907
to_url(Lol) -> "/" ++ string:join(Lol, "/").
19041908

1905-
atomise(Name) when is_list(Name) ->
1906-
list_to_atom(re:replace(Name, "-", "_", [{return,list}, global])).
1907-
19081909
unescape(Str) -> unescape(Str, []).
19091910

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

0 commit comments

Comments
 (0)