diff options
| author | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-08-23 14:21:48 +0100 |
|---|---|---|
| committer | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-08-23 14:21:48 +0100 |
| commit | 444cc742c9c67c06c488ee46ac0974ae81ebb847 (patch) | |
| tree | cc8147079b5fa791b4e62c1674450460646a2ff3 | |
| parent | ac77b5c2deff7e94232385d40ed8bda054839037 (diff) | |
| download | rabbitmq-server-444cc742c9c67c06c488ee46ac0974ae81ebb847.tar.gz | |
put result in `ok'
| -rw-r--r-- | src/rabbit_misc.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index 69d96ad4..9b54958d 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -218,8 +218,8 @@ ([pid()], any()) -> {[{pid(), any()}], [{pid(), any()}]}). -spec(os_cmd/1 :: (string()) -> string()). -spec(gb_sets_difference/2 :: (gb_set(), gb_set()) -> gb_set()). --spec(json_encode/1 :: (any()) -> string() | {'error', any()}). --spec(json_decode/1 :: (string()) -> any() | 'error'). +-spec(json_encode/1 :: (any()) -> {'ok', string()} | {'error', any()}). +-spec(json_decode/1 :: (string()) -> {'ok', any()} | 'error'). -endif. @@ -940,7 +940,7 @@ gb_sets_difference(S1, S2) -> json_encode(Term) -> try - mochijson2:encode(Term) + {ok, mochijson2:encode(Term)} catch exit:{json_encode, E} -> {error, E} @@ -948,7 +948,7 @@ json_encode(Term) -> json_decode(Term) -> try - mochijson2:decode(Term) + {ok, mochijson2:decode(Term)} catch %% Sadly `mochijson2:decode/1' does not offer a nice way to catch %% decoding errors... |