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 /java/src/IceInternal/MetricsMap.java | |
| 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 'java/src/IceInternal/MetricsMap.java')
| -rw-r--r-- | java/src/IceInternal/MetricsMap.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/java/src/IceInternal/MetricsMap.java b/java/src/IceInternal/MetricsMap.java index f9f855494f2..7716140b0e1 100644 --- a/java/src/IceInternal/MetricsMap.java +++ b/java/src/IceInternal/MetricsMap.java @@ -306,11 +306,6 @@ public class MetricsMap<T extends IceMX.Metrics> synchronized IceMX.Metrics[] getMetrics() { - if(_objects.isEmpty()) - { - return null; - } - IceMX.Metrics[] metrics = new IceMX.Metrics[_objects.size()]; int i = 0; for(Entry e : _objects.values()) |