diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-07-04 18:39:14 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-07-04 18:39:14 +0200 |
| commit | 2ff59829a733c1fdb9877caf9a3e34470c0835c0 (patch) | |
| tree | 87de9a4829922ae5f16a11e01f51b9ff6ec079d6 /cpp/src/Ice/MetricsAdminI.cpp | |
| parent | Fixed ICE-5343 - fixed InputStream::read to clear optional if optional is not... (diff) | |
| download | ice-2ff59829a733c1fdb9877caf9a3e34470c0835c0.tar.bz2 ice-2ff59829a733c1fdb9877caf9a3e34470c0835c0.tar.xz ice-2ff59829a733c1fdb9877caf9a3e34470c0835c0.zip | |
Fixed ICE-5346 - return empty map rather than no maps for metrics view if the map is enabled
Diffstat (limited to 'cpp/src/Ice/MetricsAdminI.cpp')
| -rw-r--r-- | cpp/src/Ice/MetricsAdminI.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/cpp/src/Ice/MetricsAdminI.cpp b/cpp/src/Ice/MetricsAdminI.cpp index 15dd907078d..25bf2c2e957 100644 --- a/cpp/src/Ice/MetricsAdminI.cpp +++ b/cpp/src/Ice/MetricsAdminI.cpp @@ -332,11 +332,7 @@ MetricsViewI::getMetrics() MetricsView metrics; for(map<string, MetricsMapIPtr>::const_iterator p = _maps.begin(); p != _maps.end(); ++p) { - MetricsMap map = p->second->getMetrics(); - if(!map.empty()) - { - metrics.insert(make_pair(p->first, map)); - } + metrics.insert(make_pair(p->first, p->second->getMetrics())); } return metrics; } |