diff options
| author | Aidan Skinner <aidan@apache.org> | 2009-02-10 17:39:25 +0000 |
|---|---|---|
| committer | Aidan Skinner <aidan@apache.org> | 2009-02-10 17:39:25 +0000 |
| commit | 83c75e56fe17323a86c65cd7594fdb3be170f834 (patch) | |
| tree | 65700a43d3716287c2ac7cf36ddefb0e36947ad4 | |
| parent | 479a9f9704e412c4a7808e9ed6a4d60de0c88b46 (diff) | |
| download | qpid-python-83c75e56fe17323a86c65cd7594fdb3be170f834.tar.gz | |
Change package, remove dependency on Java DNS server
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@743029 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java b/qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java index 0b9e2ab35e..4ffc32c218 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java +++ b/qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java @@ -15,9 +15,10 @@ * permissions and limitations under the License. * ***********************************************************************/ -package org.apache.james.util; +package org.apache.qpid.util; import java.net.InetAddress; +import java.net.UnknownHostException; import java.util.Collection; import java.util.ArrayList; import java.util.Iterator; @@ -62,7 +63,7 @@ public class NetMatcher try { - ip = org.apache.james.dnsserver.DNSServer.getByName(hostIP); + ip = InetAddress.getByName(hostIP); } catch (java.net.UnknownHostException uhe) { @@ -130,7 +131,7 @@ class InetNetwork public boolean contains(final String name) throws java.net.UnknownHostException { - return network.equals(maskIP(org.apache.james.dnsserver.DNSServer.getByName(name), netmask)); + return network.equals(maskIP(InetAddress.getByName(name), netmask)); } public boolean contains(final InetAddress ip) @@ -164,8 +165,8 @@ class InetNetwork else if (netspec.indexOf('.', iSlash) == -1) netspec = normalizeFromCIDR(netspec); } - return new InetNetwork(org.apache.james.dnsserver.DNSServer.getByName(netspec.substring(0, netspec.indexOf('/'))), - org.apache.james.dnsserver.DNSServer.getByName(netspec.substring(netspec.indexOf('/') + 1))); + return new InetNetwork(InetAddress.getByName(netspec.substring(0, netspec.indexOf('/'))), + InetAddress.getByName(netspec.substring(netspec.indexOf('/') + 1))); } public static InetAddress maskIP(final byte[] ip, final byte[] mask) |