summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2011-03-07 18:23:56 +0000
committerSimon MacMullen <simon@rabbitmq.com>2011-03-07 18:23:56 +0000
commit7b29c01df022470215de6e21c210f7cc2488f0a7 (patch)
treedcd3426bb14544a193bfe89489c0f3b25765e85e
parent8b4adcb0de5e4e11488bab57af2a5e9e9b7f43dd (diff)
downloadrabbitmq-server-git-7b29c01df022470215de6e21c210f7cc2488f0a7.tar.gz
Simpler is_new_version/1.
-rw-r--r--src/rabbit_upgrade.erl9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/rabbit_upgrade.erl b/src/rabbit_upgrade.erl
index 0a82187853..f59dbdfefe 100644
--- a/src/rabbit_upgrade.erl
+++ b/src/rabbit_upgrade.erl
@@ -401,7 +401,8 @@ lock_filename(Dir) -> filename:join(Dir, ?LOCK_FILENAME).
info(Msg, Args) -> error_logger:info_msg(Msg, Args).
is_new_version(Version) ->
- is_list(Version) andalso
- length(Version) > 0 andalso
- lists:all(fun(Item) -> is_tuple(Item) andalso size(Item) == 2 end,
- Version).
+ try
+ orddict:size(Version) > 0
+ catch error:badarg ->
+ false
+ end.