diff options
| author | Anders Svensson <[email protected]> | 2017-09-05 15:00:58 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2017-09-05 15:00:58 +0200 |
| commit | 31c4defc94c44f8cdb2bd54b0a4f829f47e4ac69 (patch) | |
| tree | af3f1c1c58a0906ac5c9b074996a7e9d75f4ffcd /lib/diameter/src/compiler | |
| parent | 67f6114d3701dd38614acf520f13c07174a99d11 (diff) | |
| parent | eb54c14b3c0ad26c365e6be70256f16fc8e72d70 (diff) | |
| download | otp-31c4defc94c44f8cdb2bd54b0a4f829f47e4ac69.tar.gz otp-31c4defc94c44f8cdb2bd54b0a4f829f47e4ac69.tar.bz2 otp-31c4defc94c44f8cdb2bd54b0a4f829f47e4ac69.zip | |
Merge branch 'anders/diameter/DOIC/OTP-14588' into maint
* anders/diameter/DOIC/OTP-14588:
Exercise avp_dictionaries in traffic suite
Let generic AVPs be encoded/decoded in alternate dictionaries
Rename field in codec map: dictionary -> app_dictionary
Add RFC 7683 Diameter Overload Indicator Conveyance text and dictionary
Fix decode undef
Fix dictionary compilation error message
Diffstat (limited to 'lib/diameter/src/compiler')
| -rw-r--r-- | lib/diameter/src/compiler/diameter_dict_util.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/diameter/src/compiler/diameter_dict_util.erl b/lib/diameter/src/compiler/diameter_dict_util.erl index f9f2b02e94..7b53e51cb6 100644 --- a/lib/diameter/src/compiler/diameter_dict_util.erl +++ b/lib/diameter/src/compiler/diameter_dict_util.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2016. All Rights Reserved. +%% Copyright Ericsson AB 2010-2017. 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. @@ -923,7 +923,7 @@ xa([D|_] = Ds, [[Qual, D, {_, Line, AvpName}] | Avps], Dict, Key, Name) -> store_new({Key, {Name, AvpName}}, [Line, Qual, D], Dict, - [Name, Line], + [AvpName, Line], avp_already_referenced), Key, Name); |