diff options
| author | Mark Spruiell <mes@zeroc.com> | 2008-01-30 06:15:20 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2008-01-30 06:15:20 -0800 |
| commit | f3c3029ff651d294a1a0df0e79e72771307310fc (patch) | |
| tree | 1f061a96f5f46051b6daf45ccbdb63ebd2cdd746 /java/src/IceInternal/LocatorManager.java | |
| parent | Fixed and moved fixVersion.py/fixCopyright.py (diff) | |
| download | ice-f3c3029ff651d294a1a0df0e79e72771307310fc.tar.bz2 ice-f3c3029ff651d294a1a0df0e79e72771307310fc.tar.xz ice-f3c3029ff651d294a1a0df0e79e72771307310fc.zip | |
using Java5 types in Ice core; general cleanup
Diffstat (limited to 'java/src/IceInternal/LocatorManager.java')
| -rw-r--r-- | java/src/IceInternal/LocatorManager.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/java/src/IceInternal/LocatorManager.java b/java/src/IceInternal/LocatorManager.java index 72f9a54dada..d45d4bff34a 100644 --- a/java/src/IceInternal/LocatorManager.java +++ b/java/src/IceInternal/LocatorManager.java @@ -18,10 +18,10 @@ public final class LocatorManager synchronized void destroy() { - java.util.Iterator i = _table.values().iterator(); + java.util.Iterator<LocatorInfo> i = _table.values().iterator(); while(i.hasNext()) { - LocatorInfo info = (LocatorInfo)i.next(); + LocatorInfo info = i.next(); info.destroy(); } _table.clear(); @@ -51,7 +51,7 @@ public final class LocatorManager synchronized(this) { - LocatorInfo info = (LocatorInfo)_table.get(locator); + LocatorInfo info = _table.get(locator); if(info == null) { // @@ -59,7 +59,7 @@ public final class LocatorManager // have only one table per locator (not one per locator // proxy). // - LocatorTable table = (LocatorTable)_locatorTables.get(locator.ice_getIdentity()); + LocatorTable table = _locatorTables.get(locator.ice_getIdentity()); if(table == null) { table = new LocatorTable(); @@ -74,6 +74,8 @@ public final class LocatorManager } } - private java.util.HashMap _table = new java.util.HashMap(); - private java.util.HashMap _locatorTables = new java.util.HashMap(); + private java.util.HashMap<Ice.LocatorPrx, LocatorInfo> _table = + new java.util.HashMap<Ice.LocatorPrx, LocatorInfo>(); + private java.util.HashMap<Ice.Identity, LocatorTable> _locatorTables = + new java.util.HashMap<Ice.Identity, LocatorTable>(); } |