diff options
| author | Mark Spruiell <mes@zeroc.com> | 2009-04-03 15:15:13 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2009-04-03 15:15:13 -0700 |
| commit | b415955846ce0d5c2e0c283f897190ccd2c3616a (patch) | |
| tree | 10daf6bb8a05edf5052a33f10ea16c73d8ae0d89 /java/src/IceInternal/Network.java | |
| parent | Bug 3465 - Remove _adapter members from test where unecessary (diff) | |
| download | ice-b415955846ce0d5c2e0c283f897190ccd2c3616a.tar.bz2 ice-b415955846ce0d5c2e0c283f897190ccd2c3616a.tar.xz ice-b415955846ce0d5c2e0c283f897190ccd2c3616a.zip | |
removing Java2 mapping
Diffstat (limited to 'java/src/IceInternal/Network.java')
| -rw-r--r-- | java/src/IceInternal/Network.java | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/java/src/IceInternal/Network.java b/java/src/IceInternal/Network.java index f93ef8b4264..4da8ddc89f3 100644 --- a/java/src/IceInternal/Network.java +++ b/java/src/IceInternal/Network.java @@ -36,9 +36,9 @@ public final class Network "remote host refused an attempted connect operation" // ECONNREFUSED (AIX JDK 1.4.2) }; - for(int i = 0; i < msgs.length; i++) + for(String m : msgs) { - if(msg.indexOf(msgs[i]) != -1) + if(msg.indexOf(m) != -1) { return true; } @@ -63,9 +63,9 @@ public final class Network "too many open files in system" // ENFILE }; - for(int i = 0; i < msgs.length; i++) + for(String m : msgs) { - if(msg.indexOf(msgs[i]) != -1) + if(msg.indexOf(m) != -1) { return true; } @@ -815,11 +815,11 @@ public final class Network addrs = java.net.InetAddress.getAllByName(host); } - for(int i = 0; i < addrs.length; ++i) + for(java.net.InetAddress addr : addrs) { - if(protocol == EnableBoth || isValidAddr(addrs[i], protocol)) + if(protocol == EnableBoth || isValidAddr(addr, protocol)) { - addresses.add(new java.net.InetSocketAddress(addrs[i], port)); + addresses.add(new java.net.InetSocketAddress(addr, port)); } } } @@ -940,14 +940,12 @@ public final class Network if(wildcard) { java.util.ArrayList<java.net.InetAddress> addrs = getLocalAddresses(protocolSupport); - java.util.Iterator<java.net.InetAddress> p = addrs.iterator(); - while(p.hasNext()) + for(java.net.InetAddress addr : addrs) { // // NOTE: We don't publish link-local IPv6 addresses as these addresses can only // be accessed in general with a scope-id. // - java.net.InetAddress addr = p.next(); if(!addr.isLinkLocalAddress()) { hosts.add(addr.getHostAddress()); @@ -1175,11 +1173,11 @@ public final class Network addrs = java.net.InetAddress.getAllByName(host); } - for(int i = 0; i < addrs.length; ++i) + for(java.net.InetAddress addr : addrs) { - if(protocol == EnableBoth || isValidAddr(addrs[i], protocol)) + if(protocol == EnableBoth || isValidAddr(addr, protocol)) { - return new java.net.InetSocketAddress(addrs[i], port); + return new java.net.InetSocketAddress(addr, port); } } } |