diff options
| author | Erlang/OTP <[email protected]> | 2019-02-14 12:34:44 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2019-02-14 12:34:44 +0100 |
| commit | 8e3ed72989170224dea97db61b7feec74d9865ce (patch) | |
| tree | 4e608f877a941400782d00041d0107bbf7e4bfb3 | |
| parent | 354da9029c62668d1ef5284aa60426d3b5349ecb (diff) | |
| parent | 6dfd7b201ae21054eab63a887767a7b280eb1b3f (diff) | |
| download | otp-8e3ed72989170224dea97db61b7feec74d9865ce.tar.gz otp-8e3ed72989170224dea97db61b7feec74d9865ce.tar.bz2 otp-8e3ed72989170224dea97db61b7feec74d9865ce.zip | |
Merge branch 'anders/diameter/nocatch/OTP-15569' into maint-20
* anders/diameter/nocatch/OTP-15569:
Update appup
Fix nocatch on incoming answer with faulty Experimental-Result-Code
| -rw-r--r-- | lib/diameter/src/base/diameter_gen.erl | 2 | ||||
| -rw-r--r-- | lib/diameter/src/base/diameter_traffic.erl | 2 | ||||
| -rw-r--r-- | lib/diameter/src/diameter.appup.src | 9 |
3 files changed, 9 insertions, 4 deletions
diff --git a/lib/diameter/src/base/diameter_gen.erl b/lib/diameter/src/base/diameter_gen.erl index 93ebe57685..d30c3d0441 100644 --- a/lib/diameter/src/base/diameter_gen.erl +++ b/lib/diameter/src/base/diameter_gen.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2017. All Rights Reserved. +%% Copyright Ericsson AB 2010-2019. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/lib/diameter/src/base/diameter_traffic.erl b/lib/diameter/src/base/diameter_traffic.erl index d2856ae530..2d3e4a2ac9 100644 --- a/lib/diameter/src/base/diameter_traffic.erl +++ b/lib/diameter/src/base/diameter_traffic.erl @@ -1925,6 +1925,8 @@ get_avp(Dict, Name, [#diameter_header{} | Avps]) -> A = find_avp(Code, Vid, Avps), avp_decode(Dict, Name, ungroup(A)) catch + {diameter_gen, _} -> %% faulty Grouped AVP + undefined; error: _ -> undefined end; diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src index 05a8c9378e..dc09b0422a 100644 --- a/lib/diameter/src/diameter.appup.src +++ b/lib/diameter/src/diameter.appup.src @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2018. All Rights Reserved. +%% Copyright Ericsson AB 2010-2019. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -57,7 +57,9 @@ {"2.1", [{restart_application, diameter}]}, %% 20.1 {"2.1.1", [{restart_application, diameter}]}, %% 20.1.2 {"2.1.2", [{restart_application, diameter}]}, %% 20.1.3 - {"2.1.3", [{restart_application, diameter}]} %% 20.2 + {"2.1.3", [{restart_application, diameter}]}, %% 20.2 + {"2.1.4", [{load_module, diameter_traffic, brutal_purge, soft_purge, []}]} + %% 20.3 ], [ {"0.9", [{restart_application, diameter}]}, @@ -96,6 +98,7 @@ {"2.1", [{restart_application, diameter}]}, {"2.1.1", [{restart_application, diameter}]}, {"2.1.2", [{restart_application, diameter}]}, - {"2.1.3", [{restart_application, diameter}]} + {"2.1.3", [{restart_application, diameter}]}, + {"2.1.4", [{load_module, diameter_traffic}]} ] }. |