diff options
| author | Anders Svensson <[email protected]> | 2012-09-25 18:11:51 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2012-09-25 18:15:25 +0200 |
| commit | e02ab3b7c6129d59009dda5a9a357edecd3258d7 (patch) | |
| tree | 07ccbc5bc117c130918a4ef2f84b9a16bdddcd39 | |
| parent | 2d3a6154748061edd66b721bc11dbed9046d49ff (diff) | |
| download | otp-e02ab3b7c6129d59009dda5a9a357edecd3258d7.tar.gz otp-e02ab3b7c6129d59009dda5a9a357edecd3258d7.tar.bz2 otp-e02ab3b7c6129d59009dda5a9a357edecd3258d7.zip | |
Fix matching in case of erroneous capabilities config
{invalid, K, V} was never matched. Return full reason, not just an
atom.
| -rw-r--r-- | lib/diameter/src/base/diameter_capx.erl | 2 | ||||
| -rw-r--r-- | lib/diameter/src/base/diameter_config.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/diameter/src/base/diameter_capx.erl b/lib/diameter/src/base/diameter_capx.erl index 6a87819f04..190d37262b 100644 --- a/lib/diameter/src/base/diameter_capx.erl +++ b/lib/diameter/src/base/diameter_capx.erl @@ -151,7 +151,7 @@ cap(_, Vs) Vs; cap(K, V) -> - ?THROW({invalid, K, V}). + ?THROW({invalid, {K,V}}). ipaddr(A) -> try diff --git a/lib/diameter/src/base/diameter_config.erl b/lib/diameter/src/base/diameter_config.erl index e47f63f814..d1916c26e6 100644 --- a/lib/diameter/src/base/diameter_config.erl +++ b/lib/diameter/src/base/diameter_config.erl @@ -563,7 +563,7 @@ make_caps(Caps, Opts) -> case diameter_capx:make_caps(Caps, Opts) of {ok, T} -> T; - {error, {Reason, _}} -> + {error, Reason} -> ?THROW(Reason) end. |