diff options
author | Siri Hansen <[email protected]> | 2013-06-04 11:15:17 +0200 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2013-06-04 11:15:17 +0200 |
commit | 4a25ec13e624989af191a2297f904df87d8e3248 (patch) | |
tree | 91432765cf61c01ccd0682075004fb45d4054052 /lib/observer/src/observer_lib.erl | |
parent | ca98e0725a3cb604bda6f3ab579dbcdb387dc180 (diff) | |
parent | a58a2987ab699b452dd1c95dca62147a827e7c7f (diff) | |
download | otp-4a25ec13e624989af191a2297f904df87d8e3248.tar.gz otp-4a25ec13e624989af191a2297f904df87d8e3248.tar.bz2 otp-4a25ec13e624989af191a2297f904df87d8e3248.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/observer/src/observer_lib.erl')
-rw-r--r-- | lib/observer/src/observer_lib.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/observer/src/observer_lib.erl b/lib/observer/src/observer_lib.erl index 4077f8371a..f7712cf3da 100644 --- a/lib/observer/src/observer_lib.erl +++ b/lib/observer/src/observer_lib.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2011-2012. All Rights Reserved. +%% Copyright Ericsson AB 2011-2013. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -122,7 +122,10 @@ fill_info([{Str, Key}|Rest], Data) when is_atom(Key); is_function(Key) -> [{Str, get_value(Key, Data)} | fill_info(Rest, Data)]; fill_info([{Str, {Format, Key}}|Rest], Data) when is_atom(Key); is_function(Key), is_atom(Format) -> - [{Str, {Format, get_value(Key,Data)}} | fill_info(Rest, Data)]; + case get_value(Key, Data) of + undefined -> [{Str, undefined} | fill_info(Rest, Data)]; + Value -> [{Str, {Format, Value}} | fill_info(Rest, Data)] + end; fill_info([{Str,SubStructure}|Rest], Data) when is_list(SubStructure) -> [{Str, fill_info(SubStructure, Data)}|fill_info(Rest,Data)]; fill_info([{Str,Attrib,SubStructure}|Rest], Data) -> |