diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2009-04-13 11:43:30 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2009-04-13 11:43:30 +0000 |
| commit | 74f3baec729eda36d10d1f11f4c3d14eef1a25bf (patch) | |
| tree | e01db19e1777aa00b20495738c12ce5b7ce77ea3 /qpid/java/common | |
| parent | 808789f8b6cab08e55b969037a4602a1de615f6b (diff) | |
| download | qpid-python-74f3baec729eda36d10d1f11f4c3d14eef1a25bf.tar.gz | |
Change package, remove dependency on Java DNS server
merged from trunk r743029
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764417 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/common')
| -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) |