Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2016-12-27 19:59:28 -0500
committerslewis2016-12-27 19:59:28 -0500
commit8e4587632204cf255f924bb4859d9f62689e03b1 (patch)
tree46f2cd75c5ad8889eb7002d2894fab1ead80b6b9 /providers/bundles
parentb6b833fd6c30eb66a8c2d707882c91798f683858 (diff)
downloadorg.eclipse.ecf-8e4587632204cf255f924bb4859d9f62689e03b1.tar.gz
org.eclipse.ecf-8e4587632204cf255f924bb4859d9f62689e03b1.tar.xz
org.eclipse.ecf-8e4587632204cf255f924bb4859d9f62689e03b1.zip
Attempt to work around jmdns livelock problem in
JmDNSImpl.unregisterAllServices() line 586 Change-Id: I0169cfd1cfc43312024d9a9e87ca34b5cc3dedfc
Diffstat (limited to 'providers/bundles')
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.jmdns/jmdns/javax/jmdns/impl/JmDNSImpl.java6
1 files changed, 3 insertions, 3 deletions
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 cbe073a6c..c10d2ab4d 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
@@ -587,7 +587,7 @@ public class JmDNSImpl extends JmDNS {
try {
synchronized (lock) {
if (!closed) {
- lock.wait();
+ lock.wait(1000);
}
}
} catch (final InterruptedException e) {
@@ -970,7 +970,7 @@ public class JmDNSImpl extends JmDNS {
// This should cover the case of the IP address changing under our feet
if (DNSState.CANCELED != getState()) {
synchronized (this) { // Synchronize only if we are not already in process to prevent
- // dead locks
+ // dead locks
//
// logger.finer("recover() Cleanning up");
// Stop JmDNS
@@ -1009,7 +1009,7 @@ public class JmDNSImpl extends JmDNS {
public void close() {
if (getState() != DNSState.CANCELED) {
synchronized (this) { // Synchronize only if we are not already in process to prevent
- // dead locks
+ // dead locks
// Stop JmDNS
setState(DNSState.CANCELED); // This protects against recursive
// calls

Back to the top