summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/MetricsAdminI.java
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2014-08-08 16:09:22 -0230
committerMatthew Newhook <matthew@zeroc.com>2014-08-08 16:09:22 -0230
commit36b0fecf6baca78f86ac16d236ef917d4fb0faff (patch)
treea979f4e822ff1a1a50475a45d4f228aff1353de2 /java/src/IceInternal/MetricsAdminI.java
parentICE-5596 add Ice.Default.Timeout property (diff)
downloadice-36b0fecf6baca78f86ac16d236ef917d4fb0faff.tar.bz2
ice-36b0fecf6baca78f86ac16d236ef917d4fb0faff.tar.xz
ice-36b0fecf6baca78f86ac16d236ef917d4fb0faff.zip
Fixed lots of warnings.
Diffstat (limited to 'java/src/IceInternal/MetricsAdminI.java')
-rw-r--r--java/src/IceInternal/MetricsAdminI.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/java/src/IceInternal/MetricsAdminI.java b/java/src/IceInternal/MetricsAdminI.java
index 3cb4833d0be..ef92f9c0a5f 100644
--- a/java/src/IceInternal/MetricsAdminI.java
+++ b/java/src/IceInternal/MetricsAdminI.java
@@ -100,7 +100,7 @@ public class MetricsAdminI extends IceMX._MetricsAdminDisp implements Ice.Proper
public void updateViews()
{
- java.util.Set<MetricsMapFactory> updatedMaps = new java.util.HashSet<MetricsMapFactory>();
+ java.util.Set<MetricsMapFactory<?> > updatedMaps = new java.util.HashSet<MetricsMapFactory<?> >();
synchronized(this)
{
String viewsPrefix = "IceMX.Metrics.";
@@ -169,7 +169,7 @@ public class MetricsAdminI extends IceMX._MetricsAdminDisp implements Ice.Proper
//
// Call the updaters to update the maps.
//
- for(MetricsMapFactory f : updatedMaps)
+ for(MetricsMapFactory<?> f : updatedMaps)
{
f.update();
}
@@ -375,7 +375,7 @@ public class MetricsAdminI extends IceMX._MetricsAdminDisp implements Ice.Proper
}
private boolean
- addOrUpdateMap(String mapName, MetricsMapFactory factory)
+ addOrUpdateMap(String mapName, MetricsMapFactory<?> factory)
{
boolean updated = false;
for(MetricsViewI v : _views.values())