Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkuppe2009-02-18 15:57:09 +0000
committermkuppe2009-02-18 15:57:09 +0000
commitf071d0c3922713cdc54491169348dc3352cb23d1 (patch)
treeb7a4da03c43f69140f1a06649fc39e6228a15523
parent8fb07112c1349f4b83d2287106178b112d87fe41 (diff)
downloadorg.eclipse.ecf-f071d0c3922713cdc54491169348dc3352cb23d1.tar.gz
org.eclipse.ecf-f071d0c3922713cdc54491169348dc3352cb23d1.tar.xz
org.eclipse.ecf-f071d0c3922713cdc54491169348dc3352cb23d1.zip
NEW - bug 265312: [Discovery][JMDNS] Replace binary jar with sources
https://bugs.eclipse.org/bugs/show_bug.cgi?id=265312 Commented all references to java.util.logging.*. Now we are golden on CDC1.1.
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSCache.java6
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSEntry.java4
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSIncoming.java10
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSOutgoing.java10
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSQuestion.java4
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSRecord.java38
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSState.java4
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/HostInfo.java8
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/JmDNSImpl.java122
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/ServiceEventImpl.java4
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/ServiceInfoImpl.java4
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/SocketListener.java12
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/Announcer.java12
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/Canceler.java10
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/Prober.java12
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/RecordReaper.java6
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/Renewer.java12
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/Responder.java16
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/ServiceInfoResolver.java8
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/ServiceResolver.java10
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/TypeResolver.java10
21 files changed, 161 insertions, 161 deletions
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSCache.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSCache.java
index 6496cfea4..9446c1623 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSCache.java
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSCache.java
@@ -7,7 +7,7 @@ package javax.jmdns.impl;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.logging.Logger;
+//import java.util.logging.Logger;
/**
* A table of DNS entries. This is a hash table which can handle multiple
@@ -40,7 +40,7 @@ import java.util.logging.Logger;
*/
public class DNSCache
{
- private static Logger logger = Logger.getLogger(DNSCache.class.getName());
+// private static Logger logger = Logger.getLogger(DNSCache.class.getName());
// Implementation note:
// We might completely hide the existence of CacheNode's in a future version
// of DNSCache. But this will require to implement two (inner) classes for
@@ -70,7 +70,7 @@ public class DNSCache
*/
public static class CacheNode
{
- private static Logger logger = Logger.getLogger(CacheNode.class.getName());
+// private static Logger logger = Logger.getLogger(CacheNode.class.getName());
private final DNSEntry value;
private CacheNode next;
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSEntry.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSEntry.java
index 4c74137a5..8b36eb915 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSEntry.java
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSEntry.java
@@ -5,7 +5,7 @@
package javax.jmdns.impl;
-import java.util.logging.Logger;
+//import java.util.logging.Logger;
/**
* DNS entry with a name, type, and class. This is the base
@@ -16,7 +16,7 @@ import java.util.logging.Logger;
*/
public class DNSEntry
{
- private static Logger logger = Logger.getLogger(DNSEntry.class.getName());
+// private static Logger logger = Logger.getLogger(DNSEntry.class.getName());
String key;
String name;
int type;
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSIncoming.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSIncoming.java
index 17516967e..c9f931c5b 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSIncoming.java
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSIncoming.java
@@ -13,8 +13,8 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+//import java.util.logging.Level;
+//import java.util.logging.Logger;
/**
* Parse an incoming DNS message into its components.
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
*/
public final class DNSIncoming
{
- private static Logger logger = Logger.getLogger(DNSIncoming.class.getName());
+// private static Logger logger = Logger.getLogger(DNSIncoming.class.getName());
// This is a hack to handle a bug in the BonjourConformanceTest
// It is sending out target strings that don't follow the "domain name"
@@ -151,7 +151,7 @@ public final class DNSIncoming
// Maybe we should do something with those
break;
default :
- logger.finer("DNSIncoming() unknown type:" + type);
+// logger.finer("DNSIncoming() unknown type:" + type);
break;
}
@@ -189,7 +189,7 @@ public final class DNSIncoming
}
catch (IOException e)
{
- logger.log(Level.WARNING, "DNSIncoming() dump " + print(true) + "\n exception ", e);
+// logger.log(Level.WARNING, "DNSIncoming() dump " + print(true) + "\n exception ", e);
throw e;
}
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSOutgoing.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSOutgoing.java
index 7e1b23b1a..ba27ab012 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSOutgoing.java
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSOutgoing.java
@@ -8,8 +8,8 @@ package javax.jmdns.impl;
import java.io.IOException;
import java.util.Hashtable;
import java.util.LinkedList;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+//import java.util.logging.Level;
+//import java.util.logging.Logger;
/**
* An outgoing DNS message.
@@ -25,7 +25,7 @@ public final class DNSOutgoing
*/
public static boolean USE_DOMAIN_NAME_COMPRESSION = true;
- private static Logger logger = Logger.getLogger(DNSOutgoing.class.getName());
+// private static Logger logger = Logger.getLogger(DNSOutgoing.class.getName());
int id;
int flags;
private boolean multicast;
@@ -259,14 +259,14 @@ public final class DNSOutgoing
if (val > off)
{
- logger.log(Level.WARNING, "DNSOutgoing writeName failed val=" + val + " name=" + name);
+// logger.log(Level.WARNING, "DNSOutgoing writeName failed val=" + val + " name=" + name);
}
writeByte((val >> 8) | 0xC0);
writeByte(val & 0xFF);
return;
}
- names.put(name, Integer.valueOf(off));
+ names.put(name, Integer.valueOf(""+off));
}
writeUTF(name, 0, n);
name = name.substring(n);
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSQuestion.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSQuestion.java
index b37b2d361..0b03da8f8 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSQuestion.java
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSQuestion.java
@@ -5,7 +5,7 @@
package javax.jmdns.impl;
-import java.util.logging.Logger;
+//import java.util.logging.Logger;
/**
* A DNS question.
@@ -15,7 +15,7 @@ import java.util.logging.Logger;
*/
public final class DNSQuestion extends DNSEntry
{
- private static Logger logger = Logger.getLogger(DNSQuestion.class.getName());
+// private static Logger logger = Logger.getLogger(DNSQuestion.class.getName());
/**
* Create a question.
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSRecord.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSRecord.java
index 6fa92bb63..c50992b7c 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSRecord.java
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSRecord.java
@@ -12,8 +12,8 @@ import java.net.Inet4Address;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Iterator;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+//import java.util.logging.Level;
+//import java.util.logging.Logger;
/**
* DNS record
@@ -23,7 +23,7 @@ import java.util.logging.Logger;
*/
public abstract class DNSRecord extends DNSEntry
{
- private static Logger logger = Logger.getLogger(DNSRecord.class.getName());
+// private static Logger logger = Logger.getLogger(DNSRecord.class.getName());
private int ttl;
private long created;
@@ -111,7 +111,7 @@ public abstract class DNSRecord extends DNSEntry
}
catch (ArrayIndexOutOfBoundsException e)
{
- logger.log(Level.WARNING, "suppressedBy() message " + msg + " exception ", e);
+// logger.log(Level.WARNING, "suppressedBy() message " + msg + " exception ", e);
// msg.print(true);
return false;
}
@@ -184,7 +184,7 @@ public abstract class DNSRecord extends DNSEntry
*/
static class Address extends DNSRecord
{
- private static Logger logger = Logger.getLogger(Address.class.getName());
+// private static Logger logger = Logger.getLogger(Address.class.getName());
InetAddress addr;
Address(String name, int type, int clazz, int ttl, InetAddress addr)
@@ -202,7 +202,7 @@ public abstract class DNSRecord extends DNSEntry
}
catch (UnknownHostException exception)
{
- logger.log(Level.WARNING, "Address() exception ", exception);
+// logger.log(Level.WARNING, "Address() exception ", exception);
}
}
@@ -337,7 +337,7 @@ public abstract class DNSRecord extends DNSEntry
{
if (dnsAddress.sameType(this) && dnsAddress.sameName(this) && (!dnsAddress.sameValue(this)))
{
- logger.finer("handleQuery() Conflicting probe detected. dns state " + dns.getState() + " lex compare " + lexCompare(dnsAddress));
+// logger.finer("handleQuery() Conflicting probe detected. dns state " + dns.getState() + " lex compare " + lexCompare(dnsAddress));
// Tie-breaker test
if (dns.getState().isProbing() && lexCompare(dnsAddress) >= 0)
{
@@ -367,7 +367,7 @@ public abstract class DNSRecord extends DNSEntry
{
if (dnsAddress.sameType(this) && dnsAddress.sameName(this) && (!dnsAddress.sameValue(this)))
{
- logger.finer("handleResponse() Denial detected");
+// logger.finer("handleResponse() Denial detected");
if (dns.getState().isProbing())
{
@@ -403,7 +403,7 @@ public abstract class DNSRecord extends DNSEntry
*/
public static class Pointer extends DNSRecord
{
- private static Logger logger = Logger.getLogger(Pointer.class.getName());
+// private static Logger logger = Logger.getLogger(Pointer.class.getName());
String alias;
public Pointer(String name, int type, int clazz, int ttl, String alias)
@@ -454,7 +454,7 @@ public abstract class DNSRecord extends DNSEntry
public static class Text extends DNSRecord
{
- private static Logger logger = Logger.getLogger(Text.class.getName());
+// private static Logger logger = Logger.getLogger(Text.class.getName());
byte text[];
public Text(String name, int type, int clazz, int ttl, byte text[])
@@ -523,7 +523,7 @@ public abstract class DNSRecord extends DNSEntry
*/
public static class Service extends DNSRecord
{
- private static Logger logger = Logger.getLogger(Service.class.getName());
+// private static Logger logger = Logger.getLogger(Service.class.getName());
int priority;
int weight;
int port;
@@ -610,7 +610,7 @@ public abstract class DNSRecord extends DNSEntry
if (info != null
&& (port != info.port || !server.equalsIgnoreCase(dns.getLocalHost().getName())))
{
- logger.finer("handleQuery() Conflicting probe detected from: " + getRecordSource());
+// logger.finer("handleQuery() Conflicting probe detected from: " + getRecordSource());
DNSRecord.Service localService = new DNSRecord.Service(info.getQualifiedName(), DNSConstants.TYPE_SRV,
DNSConstants.CLASS_IN | DNSConstants.CLASS_UNIQUE,
DNSConstants.DNS_TTL, info.priority,
@@ -621,9 +621,9 @@ public abstract class DNSRecord extends DNSEntry
try
{
if(dns.getInterface().equals(getRecordSource())){
- logger.warning("Got conflicting probe from ourselves\n" +
- "incoming: " +this.toString() + "\n" +
- "local : " + localService.toString());
+// logger.warning("Got conflicting probe from ourselves\n" +
+// "incoming: " +this.toString() + "\n" +
+// "local : " + localService.toString());
}
}
catch (IOException e)
@@ -638,7 +638,7 @@ public abstract class DNSRecord extends DNSEntry
// With mutliple interfaces on a single computer it is possible to see our
// own records come in on different interfaces than the ones they were sent on.
// see section "10. Conflict Resolution" of mdns draft spec.
- logger.finer("handleQuery() Ignoring a identical service query");
+// logger.finer("handleQuery() Ignoring a identical service query");
return false;
}
@@ -650,7 +650,7 @@ public abstract class DNSRecord extends DNSEntry
info.setName(dns.incrementName(info.getName()));
dns.getServices().remove(oldName);
dns.getServices().put(info.getQualifiedName().toLowerCase(), info);
- logger.finer("handleQuery() Lost tie break: new unique name chosen:" + info.getName());
+// logger.finer("handleQuery() Lost tie break: new unique name chosen:" + info.getName());
// We revert the state to start probing again with the new name
info.revertState();
@@ -674,7 +674,7 @@ public abstract class DNSRecord extends DNSEntry
if (info != null
&& (port != info.port || !server.equalsIgnoreCase(dns.getLocalHost().getName())))
{
- logger.finer("handleResponse() Denial detected");
+// logger.finer("handleResponse() Denial detected");
if (info.getState().isProbing())
{
@@ -682,7 +682,7 @@ public abstract class DNSRecord extends DNSEntry
info.setName(dns.incrementName(info.getName()));
dns.getServices().remove(oldName);
dns.getServices().put(info.getQualifiedName().toLowerCase(), info);
- logger.finer("handleResponse() New unique name chose:" + info.getName());
+// logger.finer("handleResponse() New unique name chose:" + info.getName());
}
info.revertState();
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSState.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSState.java
index d7256f230..bd941a721 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSState.java
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/DNSState.java
@@ -5,7 +5,7 @@
package javax.jmdns.impl;
import java.util.ArrayList;
-import java.util.logging.Logger;
+//import java.util.logging.Logger;
/**
* DNSState defines the possible states for services registered with JmDNS.
@@ -15,7 +15,7 @@ import java.util.logging.Logger;
*/
public class DNSState implements Comparable
{
- private static Logger logger = Logger.getLogger(DNSState.class.getName());
+// private static Logger logger = Logger.getLogger(DNSState.class.getName());
private final String name;
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/HostInfo.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/HostInfo.java
index 839feb333..6acb03fd4 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/HostInfo.java
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/HostInfo.java
@@ -12,8 +12,8 @@ import java.net.Inet4Address;
import java.net.Inet6Address;
import java.net.InetAddress;
import java.net.NetworkInterface;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+//import java.util.logging.Level;
+//import java.util.logging.Logger;
/**
* HostInfo information on the local host to be able to cope with change of addresses.
@@ -23,7 +23,7 @@ import java.util.logging.Logger;
*/
public class HostInfo
{
- private static Logger logger = Logger.getLogger(HostInfo.class.getName());
+// private static Logger logger = Logger.getLogger(HostInfo.class.getName());
protected String name;
protected InetAddress address;
protected NetworkInterface interfaze;
@@ -46,7 +46,7 @@ public class HostInfo
catch (Exception exception)
{
// FIXME Shouldn't we take an action here?
- logger.log(Level.WARNING, "LocalHostInfo() exception ", exception);
+// logger.log(Level.WARNING, "LocalHostInfo() exception ", exception);
}
}
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/JmDNSImpl.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/JmDNSImpl.java
index b637d30f6..820fc5a76 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/JmDNSImpl.java
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/JmDNSImpl.java
@@ -20,8 +20,8 @@ import java.util.Map;
import java.util.Random;
import java.util.Timer;
import java.util.TimerTask;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+//import java.util.logging.Level;
+//import java.util.logging.Logger;
import javax.jmdns.JmDNS;
import javax.jmdns.ServiceEvent;
@@ -49,7 +49,7 @@ import javax.jmdns.impl.tasks.TypeResolver;
*/
public class JmDNSImpl extends JmDNS
{
- private static Logger logger = Logger.getLogger(JmDNSImpl.class.getName());
+// private static Logger logger = Logger.getLogger(JmDNSImpl.class.getName());
/**
* This is the multicast group, we are listening to for multicast DNS
@@ -178,7 +178,7 @@ public class JmDNSImpl extends JmDNS
*/
public JmDNSImpl() throws IOException
{
- logger.finer("JmDNS instance created");
+// logger.finer("JmDNS instance created");
try
{
final InetAddress addr = InetAddress.getLocalHost();
@@ -276,7 +276,7 @@ public class JmDNSImpl extends JmDNS
}
catch (final Exception exception)
{
- logger.log(Level.WARNING, "start() Registration exception ", exception);
+// logger.log(Level.WARNING, "start() Registration exception ", exception);
}
}
}
@@ -302,7 +302,7 @@ public class JmDNSImpl extends JmDNS
private void closeMulticastSocket()
{
- logger.finer("closeMulticastSocket()");
+// logger.finer("closeMulticastSocket()");
if (socket != null)
{
// close socket
@@ -317,8 +317,8 @@ public class JmDNSImpl extends JmDNS
}
catch (final Exception exception)
{
- logger.log(Level.WARNING, "closeMulticastSocket() Close socket exception ",
- exception);
+// logger.log(Level.WARNING, "closeMulticastSocket() Close socket exception ",
+// exception);
}
socket = null;
}
@@ -627,7 +627,7 @@ public class JmDNSImpl extends JmDNS
{
// empty
}
- logger.fine("registerService() JmDNS registered service as " + info);
+// logger.fine("registerService() JmDNS registered service as " + info);
}
/**
@@ -671,7 +671,7 @@ public class JmDNSImpl extends JmDNS
*/
public void unregisterAllServices()
{
- logger.finer("unregisterAllServices()");
+// logger.finer("unregisterAllServices()");
if (services.size() == 0)
{
return;
@@ -739,39 +739,39 @@ public class JmDNSImpl extends JmDNS
*
* @return returns true, if the name of the host had to be changed.
*/
- private boolean makeHostNameUnique(DNSRecord.Address host)
- {
- final String originalName = host.getName();
- System.currentTimeMillis();
-
- boolean collision;
- do
- {
- collision = false;
-
- // Check for collision in cache
- for (DNSCache.CacheNode j = cache.find(host.getName().toLowerCase()); j != null; j = j
- .next())
- {
- if (false)
- {
- host.name = incrementName(host.getName());
- collision = true;
- break;
- }
- }
- }
- while (collision);
-
- if (originalName.equals(host.getName()))
- {
- return false;
- }
- else
- {
- return true;
- }
- }
+// private boolean makeHostNameUnique(DNSRecord.Address host)
+// {
+// final String originalName = host.getName();
+// System.currentTimeMillis();
+//
+// boolean collision;
+// do
+// {
+// collision = false;
+//
+// // Check for collision in cache
+// for (DNSCache.CacheNode j = cache.find(host.getName().toLowerCase()); j != null; j = j
+// .next())
+// {
+// if (false)
+// {
+// host.name = incrementName(host.getName());
+// collision = true;
+// break;
+// }
+// }
+// }
+// while (collision);
+//
+// if (originalName.equals(host.getName()))
+// {
+// return false;
+// }
+// else
+// {
+// return true;
+// }
+// }
/**
* Generate a possibly unique name for a service using the information we
@@ -799,14 +799,14 @@ public class JmDNSImpl extends JmDNS
final DNSRecord.Service s = (DNSRecord.Service) a;
if (s.port != info.port || !s.server.equals(localHost.getName()))
{
- logger
- .finer("makeServiceNameUnique() JmDNS.makeServiceNameUnique srv collision:"
- + a
- + " s.server="
- + s.server
- + " "
- + localHost.getName()
- + " equals:" + (s.server.equals(localHost.getName())));
+// logger
+// .finer("makeServiceNameUnique() JmDNS.makeServiceNameUnique srv collision:"
+// + a
+// + " s.server="
+// + s.server
+// + " "
+// + localHost.getName()
+// + " equals:" + (s.server.equals(localHost.getName())));
info.setName(incrementName(info.getName()));
collision = true;
break;
@@ -1118,12 +1118,12 @@ public class JmDNSImpl extends JmDNS
try
{
final DNSIncoming msg = new DNSIncoming(packet);
- logger.finest("send() JmDNS out:" + msg.print(true));
+// logger.finest("send() JmDNS out:" + msg.print(true));
}
catch (final IOException e)
{
- logger.throwing(getClass().toString(),
- "send(DNSOutgoing) - JmDNS can not parse what it sends!!!", e);
+// logger.throwing(getClass().toString(),
+// "send(DNSOutgoing) - JmDNS can not parse what it sends!!!", e);
}
final MulticastSocket ms = socket;
if (ms != null && !ms.isClosed())
@@ -1164,7 +1164,7 @@ public class JmDNSImpl extends JmDNS
*/
public void recover()
{
- logger.finer("recover()");
+// logger.finer("recover()");
// We have an IO error so lets try to recover if anything happens lets
// close it.
// This should cover the case of the IP address changing under our feet
@@ -1174,7 +1174,7 @@ public class JmDNSImpl extends JmDNS
{ // Synchronize only if we are not already in process to prevent
// dead locks
//
- logger.finer("recover() Cleanning up");
+// logger.finer("recover() Cleanning up");
// Stop JmDNS
setState(DNSState.CANCELED); // This protects against recursive
// calls
@@ -1190,7 +1190,7 @@ public class JmDNSImpl extends JmDNS
closeMulticastSocket();
//
cache.clear();
- logger.finer("recover() All is clean");
+// logger.finer("recover() All is clean");
//
// All is clear now start the services
//
@@ -1201,9 +1201,9 @@ public class JmDNSImpl extends JmDNS
}
catch (final Exception exception)
{
- logger.log(Level.WARNING, "recover() Start services exception ", exception);
+// logger.log(Level.WARNING, "recover() Start services exception ", exception);
}
- logger.log(Level.WARNING, "recover() We are back!");
+// logger.log(Level.WARNING, "recover() We are back!");
}
}
}
@@ -1359,7 +1359,7 @@ public class JmDNSImpl extends JmDNS
*/
private void disposeServiceCollectors()
{
- logger.finer("disposeServiceCollectors()");
+// logger.finer("disposeServiceCollectors()");
synchronized (serviceCollectors)
{
for (final Iterator i = serviceCollectors.values().iterator(); i.hasNext();)
@@ -1379,7 +1379,7 @@ public class JmDNSImpl extends JmDNS
*/
private static class ServiceCollector implements ServiceListener
{
- private static Logger logger = Logger.getLogger(ServiceCollector.class.getName());
+// private static Logger logger = Logger.getLogger(ServiceCollector.class.getName());
/**
* A set of collected service instance names.
*/
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/ServiceEventImpl.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/ServiceEventImpl.java
index 2d863d2c0..df8ae2f10 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/ServiceEventImpl.java
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/ServiceEventImpl.java
@@ -4,7 +4,7 @@
package javax.jmdns.impl;
-import java.util.logging.Logger;
+//import java.util.logging.Logger;
import javax.jmdns.JmDNS;
import javax.jmdns.ServiceEvent;
@@ -18,7 +18,7 @@ import javax.jmdns.ServiceInfo;
*/
public class ServiceEventImpl extends ServiceEvent
{
- private static Logger logger = Logger.getLogger(ServiceEvent.class.getName());
+// private static Logger logger = Logger.getLogger(ServiceEvent.class.getName());
/**
* The type name of the service.
*/
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/ServiceInfoImpl.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/ServiceInfoImpl.java
index e2c9064bd..f15d1382b 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/ServiceInfoImpl.java
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/ServiceInfoImpl.java
@@ -12,7 +12,7 @@ import java.util.Enumeration;
import java.util.Hashtable;
import java.util.TimerTask;
import java.util.Vector;
-import java.util.logging.Logger;
+//import java.util.logging.Logger;
import javax.jmdns.ServiceInfo;
import javax.jmdns.impl.DNSRecord.Pointer;
@@ -27,7 +27,7 @@ import javax.jmdns.impl.DNSRecord.Text;
*/
public class ServiceInfoImpl extends ServiceInfo implements DNSListener
{
- private static Logger logger = Logger.getLogger(ServiceInfoImpl.class.getName());
+// private static Logger logger = Logger.getLogger(ServiceInfoImpl.class.getName());
private JmDNSImpl dns;
// State machine
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/SocketListener.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/SocketListener.java
index bfd161a7f..c36d6dcdb 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/SocketListener.java
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/SocketListener.java
@@ -6,15 +6,15 @@ package javax.jmdns.impl;
import java.io.IOException;
import java.net.DatagramPacket;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+//import java.util.logging.Level;
+//import java.util.logging.Logger;
/**
* Listen for multicast packets.
*/
class SocketListener implements Runnable
{
- static Logger logger = Logger.getLogger(SocketListener.class.getName());
+// static Logger logger = Logger.getLogger(SocketListener.class.getName());
/**
*
@@ -51,7 +51,7 @@ class SocketListener implements Runnable
}
DNSIncoming msg = new DNSIncoming(packet);
- logger.finest("SocketListener.run() JmDNS in:" + msg.print(true));
+// logger.finest("SocketListener.run() JmDNS in:" + msg.print(true));
synchronized (this.jmDNSImpl.getIoLock())
{
@@ -71,7 +71,7 @@ class SocketListener implements Runnable
}
catch (IOException e)
{
- logger.log(Level.WARNING, "run() exception ", e);
+// logger.log(Level.WARNING, "run() exception ", e);
}
}
}
@@ -79,7 +79,7 @@ class SocketListener implements Runnable
{
if (this.jmDNSImpl.getState() != DNSState.CANCELED)
{
- logger.log(Level.WARNING, "run() exception ", e);
+// logger.log(Level.WARNING, "run() exception ", e);
this.jmDNSImpl.recover();
}
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/Announcer.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/Announcer.java
index 7cde56a91..5de471267 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/Announcer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/Announcer.java
@@ -9,8 +9,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+//import java.util.logging.Level;
+//import java.util.logging.Logger;
import javax.jmdns.impl.DNSConstants;
import javax.jmdns.impl.DNSOutgoing;
@@ -27,7 +27,7 @@ import javax.jmdns.impl.ServiceInfoImpl;
*/
public class Announcer extends TimerTask
{
- static Logger logger = Logger.getLogger(Announcer.class.getName());
+// static Logger logger = Logger.getLogger(Announcer.class.getName());
/**
*
@@ -121,7 +121,7 @@ public class Announcer extends TimerTask
if (info.getState() == taskState && info.getTask() == this)
{
info.advanceState();
- logger.finer("run() JmDNS announcing " + info.getQualifiedName() + " state " + info.getState());
+// logger.finer("run() JmDNS announcing " + info.getQualifiedName() + " state " + info.getState());
if (out == null)
{
out = new DNSOutgoing(DNSConstants.FLAGS_QR_RESPONSE | DNSConstants.FLAGS_AA);
@@ -132,7 +132,7 @@ public class Announcer extends TimerTask
}
if (out != null)
{
- logger.finer("run() JmDNS announcing #" + taskState);
+// logger.finer("run() JmDNS announcing #" + taskState);
this.jmDNSImpl.send(out);
}
else
@@ -144,7 +144,7 @@ public class Announcer extends TimerTask
}
catch (Throwable e)
{
- logger.log(Level.WARNING, "run() exception ", e);
+// logger.log(Level.WARNING, "run() exception ", e);
this.jmDNSImpl.recover();
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/Canceler.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/Canceler.java
index 8501a870e..f832eb9dc 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/Canceler.java
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/Canceler.java
@@ -7,8 +7,8 @@ package javax.jmdns.impl.tasks;
import java.util.Collection;
import java.util.Timer;
import java.util.TimerTask;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+//import java.util.logging.Level;
+//import java.util.logging.Logger;
import javax.jmdns.impl.DNSConstants;
import javax.jmdns.impl.DNSOutgoing;
@@ -21,7 +21,7 @@ import javax.jmdns.impl.ServiceInfoImpl;
*/
public class Canceler extends TimerTask
{
- static Logger logger = Logger.getLogger(Canceler.class.getName());
+// static Logger logger = Logger.getLogger(Canceler.class.getName());
/**
*
@@ -84,7 +84,7 @@ public class Canceler extends TimerTask
{
if (++count < 3)
{
- logger.finer("run() JmDNS canceling service");
+// logger.finer("run() JmDNS canceling service");
// announce the service
//long now = System.currentTimeMillis();
DNSOutgoing out = new DNSOutgoing(DNSConstants.FLAGS_QR_RESPONSE | DNSConstants.FLAGS_AA);
@@ -110,7 +110,7 @@ public class Canceler extends TimerTask
}
catch (Throwable e)
{
- logger.log(Level.WARNING, "run() exception ", e);
+// logger.log(Level.WARNING, "run() exception ", e);
this.jmDNSImpl.recover();
}
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/Prober.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/Prober.java
index 52365444e..af2ed6344 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/Prober.java
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/Prober.java
@@ -9,8 +9,8 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+//import java.util.logging.Level;
+//import java.util.logging.Logger;
import javax.jmdns.impl.DNSConstants;
import javax.jmdns.impl.DNSOutgoing;
@@ -33,7 +33,7 @@ import javax.jmdns.impl.ServiceInfoImpl;
*/
public class Prober extends TimerTask
{
- static Logger logger = Logger.getLogger(Prober.class.getName());
+// static Logger logger = Logger.getLogger(Prober.class.getName());
/**
*
@@ -151,7 +151,7 @@ public class Prober extends TimerTask
if (info.getState() == taskState && info.getTask() == this)
{
info.advanceState();
- logger.fine("run() JmDNS probing " + info.getQualifiedName() + " state " + info.getState());
+// logger.fine("run() JmDNS probing " + info.getQualifiedName() + " state " + info.getState());
if (out == null)
{
out = new DNSOutgoing(DNSConstants.FLAGS_QR_QUERY);
@@ -167,7 +167,7 @@ public class Prober extends TimerTask
}
if (out != null)
{
- logger.finer("run() JmDNS probing #" + taskState);
+// logger.finer("run() JmDNS probing #" + taskState);
this.jmDNSImpl.send(out);
}
else
@@ -180,7 +180,7 @@ public class Prober extends TimerTask
}
catch (Throwable e)
{
- logger.log(Level.WARNING, "run() exception ", e);
+// logger.log(Level.WARNING, "run() exception ", e);
this.jmDNSImpl.recover();
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/RecordReaper.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/RecordReaper.java
index cc1d69f0d..903e74a7e 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/RecordReaper.java
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/RecordReaper.java
@@ -9,7 +9,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
-import java.util.logging.Logger;
+//import java.util.logging.Logger;
import javax.jmdns.impl.DNSCache;
import javax.jmdns.impl.DNSConstants;
@@ -22,7 +22,7 @@ import javax.jmdns.impl.JmDNSImpl;
*/
public class RecordReaper extends TimerTask
{
- static Logger logger = Logger.getLogger(RecordReaper.class.getName());
+// static Logger logger = Logger.getLogger(RecordReaper.class.getName());
/**
*
@@ -50,7 +50,7 @@ public class RecordReaper extends TimerTask
{
return;
}
- logger.finest("run() JmDNS reaping cache");
+// logger.finest("run() JmDNS reaping cache");
// Remove expired answers from the cache
// -------------------------------------
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/Renewer.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/Renewer.java
index 9b2ed3d62..4e63796b5 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/Renewer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/Renewer.java
@@ -9,8 +9,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+//import java.util.logging.Level;
+//import java.util.logging.Logger;
import javax.jmdns.impl.DNSConstants;
import javax.jmdns.impl.DNSOutgoing;
@@ -23,7 +23,7 @@ import javax.jmdns.impl.ServiceInfoImpl;
*/
public class Renewer extends TimerTask
{
- static Logger logger = Logger.getLogger(Renewer.class.getName());
+// static Logger logger = Logger.getLogger(Renewer.class.getName());
/**
*
@@ -117,7 +117,7 @@ public class Renewer extends TimerTask
if (info.getState() == taskState && info.getTask() == this)
{
info.advanceState();
- logger.finer("run() JmDNS announced " + info.getQualifiedName() + " state " + info.getState());
+// logger.finer("run() JmDNS announced " + info.getQualifiedName() + " state " + info.getState());
if (out == null)
{
out = new DNSOutgoing(DNSConstants.FLAGS_QR_RESPONSE | DNSConstants.FLAGS_AA);
@@ -128,7 +128,7 @@ public class Renewer extends TimerTask
}
if (out != null)
{
- logger.finer("run() JmDNS announced");
+// logger.finer("run() JmDNS announced");
this.jmDNSImpl.send(out);
}
else
@@ -140,7 +140,7 @@ public class Renewer extends TimerTask
}
catch (Throwable e)
{
- logger.log(Level.WARNING, "run() exception ", e);
+// logger.log(Level.WARNING, "run() exception ", e);
this.jmDNSImpl.recover();
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/Responder.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/Responder.java
index c63bdb361..894fa6caa 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/Responder.java
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/Responder.java
@@ -8,8 +8,8 @@ import java.net.InetAddress;
import java.util.HashSet;
import java.util.Iterator;
import java.util.TimerTask;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+//import java.util.logging.Level;
+//import java.util.logging.Logger;
import javax.jmdns.impl.DNSConstants;
import javax.jmdns.impl.DNSEntry;
@@ -27,7 +27,7 @@ import javax.jmdns.impl.ServiceInfoImpl;
*/
public class Responder extends TimerTask
{
- static Logger logger = Logger.getLogger(Responder.class.getName());
+// static Logger logger = Logger.getLogger(Responder.class.getName());
/**
*
@@ -64,7 +64,7 @@ public class Responder extends TimerTask
if (entry instanceof DNSQuestion)
{
DNSQuestion q = (DNSQuestion) entry;
- logger.finest("start() question=" + q);
+// logger.finest("start() question=" + q);
iAmTheOnlyOne &= (q.getType() == DNSConstants.TYPE_SRV
|| q.getType() == DNSConstants.TYPE_TXT
|| q.getType() == DNSConstants.TYPE_A
@@ -82,7 +82,7 @@ public class Responder extends TimerTask
{
delay = 0;
}
- logger.finest("start() Responder chosen delay=" + delay);
+// logger.finest("start() Responder chosen delay=" + delay);
this.jmDNSImpl.schedule(this, delay);
}
@@ -253,7 +253,7 @@ public class Responder extends TimerTask
DNSRecord knownAnswer = (DNSRecord) i.next();
if (knownAnswer.getTtl() > DNSConstants.DNS_TTL / 2 && answers.remove(knownAnswer))
{
- logger.log(Level.FINER, "JmDNS Responder Known Answer Removed");
+// logger.log(Level.FINER, "JmDNS Responder Known Answer Removed");
}
}
@@ -261,7 +261,7 @@ public class Responder extends TimerTask
// responde if we have answers
if (answers.size() != 0)
{
- logger.finer("run() JmDNS responding");
+// logger.finer("run() JmDNS responding");
DNSOutgoing out = null;
if (isUnicast)
{
@@ -282,7 +282,7 @@ public class Responder extends TimerTask
}
catch (Throwable e)
{
- logger.log(Level.WARNING, "run() exception ", e);
+// logger.log(Level.WARNING, "run() exception ", e);
this.jmDNSImpl.close();
}
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/ServiceInfoResolver.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/ServiceInfoResolver.java
index 4041ae3b5..8252a700d 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/ServiceInfoResolver.java
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/ServiceInfoResolver.java
@@ -6,8 +6,8 @@ package javax.jmdns.impl.tasks;
import java.util.Timer;
import java.util.TimerTask;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+//import java.util.logging.Level;
+//import java.util.logging.Logger;
import javax.jmdns.impl.DNSConstants;
import javax.jmdns.impl.DNSOutgoing;
@@ -27,7 +27,7 @@ import javax.jmdns.impl.ServiceInfoImpl;
*/
public class ServiceInfoResolver extends TimerTask
{
- static Logger logger = Logger.getLogger(ServiceInfoResolver.class.getName());
+// static Logger logger = Logger.getLogger(ServiceInfoResolver.class.getName());
/**
*
@@ -94,7 +94,7 @@ public class ServiceInfoResolver extends TimerTask
}
catch (Throwable e)
{
- logger.log(Level.WARNING, "run() exception ", e);
+// logger.log(Level.WARNING, "run() exception ", e);
this.jmDNSImpl.recover();
}
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/ServiceResolver.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/ServiceResolver.java
index 09c60eb42..2cc49e8a5 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/ServiceResolver.java
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/ServiceResolver.java
@@ -8,8 +8,8 @@ import java.io.IOException;
import java.util.Iterator;
import java.util.Timer;
import java.util.TimerTask;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+//import java.util.logging.Level;
+//import java.util.logging.Logger;
import javax.jmdns.impl.DNSConstants;
import javax.jmdns.impl.DNSOutgoing;
@@ -29,7 +29,7 @@ import javax.jmdns.impl.ServiceInfoImpl;
*/
public class ServiceResolver extends TimerTask
{
- static Logger logger = Logger.getLogger(ServiceResolver.class.getName());
+// static Logger logger = Logger.getLogger(ServiceResolver.class.getName());
/**
*
@@ -60,7 +60,7 @@ public class ServiceResolver extends TimerTask
{
if (count++ < 3)
{
- logger.finer("run() JmDNS querying service");
+// logger.finer("run() JmDNS querying service");
long now = System.currentTimeMillis();
DNSOutgoing out = new DNSOutgoing(DNSConstants.FLAGS_QR_QUERY);
out.addQuestion(new DNSQuestion(type, DNSConstants.TYPE_PTR, DNSConstants.CLASS_IN));
@@ -94,7 +94,7 @@ public class ServiceResolver extends TimerTask
}
catch (Throwable e)
{
- logger.log(Level.WARNING, "run() exception ", e);
+// logger.log(Level.WARNING, "run() exception ", e);
this.jmDNSImpl.recover();
}
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/TypeResolver.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/TypeResolver.java
index 15303131a..ba27d3ca0 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/TypeResolver.java
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/tasks/TypeResolver.java
@@ -7,8 +7,8 @@ package javax.jmdns.impl.tasks;
import java.util.Iterator;
import java.util.Timer;
import java.util.TimerTask;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+//import java.util.logging.Level;
+//import java.util.logging.Logger;
import javax.jmdns.impl.DNSConstants;
import javax.jmdns.impl.DNSOutgoing;
@@ -27,7 +27,7 @@ import javax.jmdns.impl.JmDNSImpl;
*/
public class TypeResolver extends TimerTask
{
- static Logger logger = Logger.getLogger(TypeResolver.class.getName());
+// static Logger logger = Logger.getLogger(TypeResolver.class.getName());
/**
*
@@ -60,7 +60,7 @@ public class TypeResolver extends TimerTask
{
if (count++ < 3)
{
- logger.finer("run() JmDNS querying type");
+// logger.finer("run() JmDNS querying type");
DNSOutgoing out = new DNSOutgoing(DNSConstants.FLAGS_QR_QUERY);
out.addQuestion(new DNSQuestion("_services._mdns._udp.local.", DNSConstants.TYPE_PTR, DNSConstants.CLASS_IN));
for (Iterator iterator = this.jmDNSImpl.getServiceTypes().values().iterator(); iterator.hasNext();)
@@ -85,7 +85,7 @@ public class TypeResolver extends TimerTask
}
catch (Throwable e)
{
- logger.log(Level.WARNING, "run() exception ", e);
+// logger.log(Level.WARNING, "run() exception ", e);
this.jmDNSImpl.recover();
}
}

Back to the top