diff options
| author | Anders Svensson <[email protected]> | 2015-12-22 15:16:22 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2015-12-22 15:16:22 +0100 |
| commit | fc7eb7da8b9ccbc883f2001cf14021da8c85da4d (patch) | |
| tree | c4c3d11721aaedeb2d124943f8aa91548432d83f /lib | |
| parent | 9088c48800c851f2b85cac8bcb0643a97525c283 (diff) | |
| parent | d7db1f1612e8a5a8a732a7e055ba5618778f1ac2 (diff) | |
| download | otp-fc7eb7da8b9ccbc883f2001cf14021da8c85da4d.tar.gz otp-fc7eb7da8b9ccbc883f2001cf14021da8c85da4d.tar.bz2 otp-fc7eb7da8b9ccbc883f2001cf14021da8c85da4d.zip | |
Merge branch 'maint-17' into maint
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/diameter/src/base/diameter_service.erl | 9 | ||||
| -rw-r--r-- | lib/diameter/src/diameter.appup.src | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lib/diameter/src/base/diameter_service.erl b/lib/diameter/src/base/diameter_service.erl index 13508321c3..d49176ec3e 100644 --- a/lib/diameter/src/base/diameter_service.erl +++ b/lib/diameter/src/base/diameter_service.erl @@ -208,7 +208,7 @@ stop_transport(SvcName, [_|_] = Refs) -> info(SvcName, Item) -> case lookup_state(SvcName) of - [#state{} = S] -> + [S] -> service_info(Item, S); [] -> undefined @@ -217,7 +217,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 ddde648e08..de0f324f47 100644 --- a/lib/diameter/src/diameter.appup.src +++ b/lib/diameter/src/diameter.appup.src @@ -44,6 +44,7 @@ {"1.9.1", [{restart_application, diameter}]}, %% 17.5.3 {"1.9.2", [{restart_application, diameter}]}, %% 17.5.5 {"1.9.2.1", [{restart_application, diameter}]}, %% 17.5.6.3 + {"1.9.2.2", [{restart_application, diameter}]}, %% 17.5.6.7 {"1.10", [{load_module, diameter_codec}, %% 18.0 {load_module, diameter_peer_fsm}, {load_module, diameter_watchdog}, @@ -87,6 +88,7 @@ {"1.9.1", [{restart_application, diameter}]}, {"1.9.2", [{restart_application, diameter}]}, {"1.9.2.1", [{restart_application, diameter}]}, + {"1.9.2.2", [{restart_application, diameter}]}, {"1.10", [{load_module, diameter_gen_relay}, {load_module, diameter_gen_base_accounting}, {load_module, diameter_gen_base_rfc3588}, |