Author: ritchiem
Date: Mon Apr 13 11:43:30 2009
New Revision: 764417
URL: http://svn.apache.org/viewvc?rev=764417&view=rev
Log:
Change package, remove dependency on Java DNS server
merged from trunk r743029
Modified:
qpid/branches/0.5-fix/qpid/ (props changed)
qpid/branches/0.5-fix/qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java
Propchange: qpid/branches/0.5-fix/qpid/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 13 11:43:30 2009
@@ -1 +1 @@
-/qpid/trunk/qpid:742626,743015,743028
+/qpid/trunk/qpid:742626,743015,743028-743029
Modified:
qpid/branches/0.5-fix/qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java?rev=764417&r1=764416&r2=764417&view=diff
==============================================================================
---
qpid/branches/0.5-fix/qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java
(original)
+++
qpid/branches/0.5-fix/qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java
Mon Apr 13 11:43:30 2009
@@ -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 @@
try
{
- ip = org.apache.james.dnsserver.DNSServer.getByName(hostIP);
+ ip = InetAddress.getByName(hostIP);
}
catch (java.net.UnknownHostException uhe)
{
@@ -130,7 +131,7 @@
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 @@
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)
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
