DESCRIPTION

Fix NPE in metadata singleton

* Add null check after attempting to access uninitialized probes.
* Inline small function that is used once.
* Minor clean up.

Change-Id: If4701da424ad9818cb53b2281e9ea515caf9cd7d
Reviewed-on: https://git.eclipse.org/r/11343
Reviewed-by: Kamila Nguyen xxx@xxx.xxx
IP-Clean: Kamila Nguyen xxx@xxx.xxx
Tested-by: Kamila Nguyen xxx@xxx.xxx


COMMENTS

author: Kamila Nguyen
date: 2013-03-20 18:48:39.000000000

Change has been successfully cherry-picked as 6ca693128a159f516a8e3676e20c4df4cc0c6e6c

-------------------------------------
