Merge branch 'anders/diameter/17.5.6.7/OTP-13211' into maint-17

* anders/diameter/17.5.6.7/OTP-13211:
  vsn -> 1.9.2.2
  Update/fix appup for 17.5.6.7
  Be resilient to diameter_service state upgrades

3 files changed, 36 insertions, 41 deletions

diff --git a/lib/diameter/src/base/diameter_service.erl b/lib/diameter/src/base/diameter_service.erl
index 7d4a24f7a0..87bc9516e0 100644
--- a/lib/diameter/src/base/diameter_service.erl
+++ b/lib/diameter/src/base/diameter_service.erl
@@ -207,7 +207,7 @@ stop_transport(SvcName, [_|_] = Refs) ->
 
 info(SvcName, Item) ->
     case lookup_state(SvcName) of
-        [#state{} = S] ->
+        [S] ->
             service_info(Item, S);
         [] ->
             undefined
@@ -216,7 +216,12 @@ info(SvcName, Item) ->
 %% lookup_state/1
 
 lookup_state(SvcName) ->
-    ets:lookup(?STATE_TABLE, SvcName).
+    case ets:lookup(?STATE_TABLE, SvcName) of
+        [#state{}] = L ->
+            L;
+        _ ->
+            []
+    end.
 
 %% ---------------------------------------------------------------------------
 %% # subscribe/1
diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index adb3f960ff..7d66557162 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -36,45 +36,40 @@
   {"1.4.4",   [{restart_application, diameter}]},
   {"1.5",     [{restart_application, diameter}]},  %% R16B03
   {"1.6",     [{restart_application, diameter}]},  %% 17.0
-  {<<"1\\.(7(\\.1)?|8)$">>,                        %% 17.[134]
+  {<<"^1\\.(7(\\.1)?|8)$">>,                       %% 17.[134]
               [{restart_application, diameter}]},
   {<<"^1.9(\\.1)?$">>,                             %% 17.5(.3)?
-              [{load_module, diameter_codec},
-               {load_module, diameter_traffic},
-               {load_module, diameter_sctp},
-               {load_module, diameter_peer_fsm},
+              [{restart_application, diameter}]},
+  {"1.9.2",   [{load_module, diameter_peer_fsm},   %% 17.5.5
                {load_module, diameter_watchdog},
                {load_module, diameter_stats},
-               {load_module, diameter_config},
+               {load_module, diameter_codec},
                {load_module, diameter_lib},
                {load_module, diameter_peer},
                {load_module, diameter_reg},
                {load_module, diameter_service},
                {load_module, diameter_session},
                {load_module, diameter_sync},
+               {load_module, diameter_traffic},
+               {load_module, diameter_sctp},
                {load_module, diameter_gen_base_rfc6733},
                {load_module, diameter_gen_acct_rfc6733},
                {load_module, diameter_gen_base_rfc3588},
                {load_module, diameter_gen_base_accounting},
-               {load_module, diameter_gen_relay}]},
-  {"1.9.2",   [{load_module, diameter_peer_fsm},   %% 17.5.5
-               {load_module, diameter_watchdog},
-               {load_module, diameter_stats},
-               {load_module, diameter_config},
+               {load_module, diameter_gen_relay},
+               {load_module, diameter},
+               {load_module, diameter_config}]},
+  {"1.9.2.1", [{load_module, diameter_watchdog},   %% 17.5.6.3
                {load_module, diameter_codec},
-               {load_module, diameter_lib},
-               {load_module, diameter_peer},
-               {load_module, diameter_reg},
-               {load_module, diameter_service},
-               {load_module, diameter_session},
-               {load_module, diameter_sync},
                {load_module, diameter_traffic},
-               {load_module, diameter_sctp},
+               {load_module, diameter_service},
                {load_module, diameter_gen_base_rfc6733},
                {load_module, diameter_gen_acct_rfc6733},
                {load_module, diameter_gen_base_rfc3588},
                {load_module, diameter_gen_base_accounting},
-               {load_module, diameter_gen_relay}]}
+               {load_module, diameter_gen_relay},
+               {load_module, diameter,
+               {load_module, diameter_config}}]}
  ],
  [
   {"0.9",     [{restart_application, diameter}]},
@@ -93,44 +88,39 @@
   {"1.4.4",   [{restart_application, diameter}]},
   {"1.5",     [{restart_application, diameter}]},
   {"1.6",     [{restart_application, diameter}]},
-  {<<"1\\.(7(\\.1)?|8)$">>,
+  {<<"^1\\.(7(\\.1)?|8)$">>,
               [{restart_application, diameter}]},
   {<<"^1.9(\\.1)?$">>,
-              [{load_module, diameter_gen_relay},
+              [{restart_application, diameter}]},
+  {"1.9.2",   [{load_module, diameter_config},
+               {load_module, diameter},
+               {load_module, diameter_gen_relay},
                {load_module, diameter_gen_base_accounting},
                {load_module, diameter_gen_base_rfc3588},
                {load_module, diameter_gen_acct_rfc6733},
                {load_module, diameter_gen_base_rfc6733},
+               {load_module, diameter_sctp},
+               {load_module, diameter_traffic},
                {load_module, diameter_sync},
                {load_module, diameter_session},
                {load_module, diameter_service},
                {load_module, diameter_reg},
                {load_module, diameter_peer},
                {load_module, diameter_lib},
-               {load_module, diameter_config},
+               {load_module, diameter_codec},
                {load_module, diameter_stats},
                {load_module, diameter_watchdog},
-               {load_module, diameter_peer_fsm},
-               {load_module, diameter_sctp},
-               {load_module, diameter_traffic},
-               {load_module, diameter_codec}]},
-  {"1.9.2",   [{load_module, diameter_gen_relay},
+               {load_module, diameter_peer_fsm}]},
+  {"1.9.2.1", [{load_module, diameter_config},
+               {load_module, diameter},
+               {load_module, diameter_gen_relay},
                {load_module, diameter_gen_base_accounting},
                {load_module, diameter_gen_base_rfc3588},
                {load_module, diameter_gen_acct_rfc6733},
                {load_module, diameter_gen_base_rfc6733},
-               {load_module, diameter_sctp},
-               {load_module, diameter_traffic},
-               {load_module, diameter_sync},
-               {load_module, diameter_session},
                {load_module, diameter_service},
-               {load_module, diameter_reg},
-               {load_module, diameter_peer},
-               {load_module, diameter_lib},
+               {load_module, diameter_traffic},
                {load_module, diameter_codec},
-               {load_module, diameter_config},
-               {load_module, diameter_stats},
-               {load_module, diameter_watchdog},
-               {load_module, diameter_peer_fsm}]}
+               {load_module, diameter_watchdog}]}
  ]
 }.
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index a16b8d712c..18b77e243f 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -16,5 +16,5 @@
 # %CopyrightEnd%
 
 APPLICATION  = diameter
-DIAMETER_VSN = 1.9.2.1
+DIAMETER_VSN = 1.9.2.2
 APP_VSN      = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)