diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2015-06-09 19:05:57 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2015-06-09 19:05:57 +0300 |
| commit | 54ec4d41bb85db2afb8806032cbf93fa0c45fbf7 (patch) | |
| tree | 6ad6a33b7a6b19cbf5d8b953496c92b70f952737 /src | |
| parent | fb96cdc63d7962bb0f8fc2519a111dc63c75a52b (diff) | |
| download | rabbitmq-server-git-54ec4d41bb85db2afb8806032cbf93fa0c45fbf7.tar.gz | |
Handle negative timeout values
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_control_main.erl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl index f211e4326c..82c8d80a98 100644 --- a/src/rabbit_control_main.erl +++ b/src/rabbit_control_main.erl @@ -201,7 +201,11 @@ parse_timeout(infinity) -> parse_timeout(N) when is_list(N) -> try parse_number(N) of M -> - {ok, round(M) * 1000} + Y = case M >= 0 of + true -> round(M) * 1000; + false -> ?RPC_TIMEOUT + end, + {ok, Y} catch error:badarg -> {error, infinity} end; |