diff options
| author | Dan Gudmundsson <[email protected]> | 2014-03-28 10:05:23 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2014-03-28 10:05:23 +0100 |
| commit | 95ffe7eb374f59ce3f289747212adf042c1cd703 (patch) | |
| tree | 5752dddb7ff2d9eb4d914402b396f226c5c2d964 /lib/mnesia/src/mnesia_snmp_hook.erl | |
| parent | 5b9ffc724e7c3ffe7c775b5113de059e2e25f755 (diff) | |
| parent | 4f63cca949982e88d958e33e2e278b18da4de4b3 (diff) | |
| download | otp-95ffe7eb374f59ce3f289747212adf042c1cd703.tar.gz otp-95ffe7eb374f59ce3f289747212adf042c1cd703.tar.bz2 otp-95ffe7eb374f59ce3f289747212adf042c1cd703.zip | |
Merge branch 'dgud/testcasecuddling'
* dgud/testcasecuddling:
os_mon: test tweaks
kernel: tweak tests
mnesia: test harder sync
mnesia: Dialyzer fixes
stdlib: loosen testcases
wx: loosen testcase
Diffstat (limited to 'lib/mnesia/src/mnesia_snmp_hook.erl')
| -rw-r--r-- | lib/mnesia/src/mnesia_snmp_hook.erl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/mnesia/src/mnesia_snmp_hook.erl b/lib/mnesia/src/mnesia_snmp_hook.erl index 893b39f3c0..256f83b029 100644 --- a/lib/mnesia/src/mnesia_snmp_hook.erl +++ b/lib/mnesia/src/mnesia_snmp_hook.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2011. All Rights Reserved. +%% Copyright Ericsson AB 1996-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -32,7 +32,11 @@ val(Var) -> case ?catch_val(Var) of - {'EXIT', _ReASoN_} -> mnesia_lib:other_val(Var, _ReASoN_); + {'EXIT', _ReASoN_} -> + case mnesia_lib:other_val(Var) of + error -> mnesia_lib:pr_other(Var, _ReASoN_); + Val -> Val + end; _VaLuE_ -> _VaLuE_ end. |