Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkuppe2009-02-19 13:11:38 +0000
committermkuppe2009-02-19 13:11:38 +0000
commitb155c6d2ff3ae80b9b826f3c599e76ca8b38eaf1 (patch)
tree9e4a7ca12c299a1d596d00a3ed50101211a45e7d /providers
parent6472d1a67bd520ae46a05706965157c54a538151 (diff)
downloadorg.eclipse.ecf-b155c6d2ff3ae80b9b826f3c599e76ca8b38eaf1.tar.gz
org.eclipse.ecf-b155c6d2ff3ae80b9b826f3c599e76ca8b38eaf1.tar.xz
org.eclipse.ecf-b155c6d2ff3ae80b9b826f3c599e76ca8b38eaf1.zip
NEW - bug 265413: [Discovery][JMDNS] Intermittent dead-lock issues in JMDNSDiscoveryContainer
https://bugs.eclipse.org/bugs/show_bug.cgi?id=265413
Diffstat (limited to 'providers')
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/JMDNSDiscoveryContainer.java18
1 files changed, 9 insertions, 9 deletions
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/JMDNSDiscoveryContainer.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/JMDNSDiscoveryContainer.java
index aa6ca7a2f..90411f0ac 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/JMDNSDiscoveryContainer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/JMDNSDiscoveryContainer.java
@@ -135,7 +135,7 @@ public class JMDNSDiscoveryContainer extends AbstractDiscoveryContainerAdapter i
*/
public void disconnect() {
synchronized (lock) {
- if(getConnectedID() == null || disposed) {
+ if (getConnectedID() == null || disposed) {
return;
}
ID connectedID = getConnectedID();
@@ -229,11 +229,11 @@ public class JMDNSDiscoveryContainer extends AbstractDiscoveryContainerAdapter i
Assert.isNotNull(serviceInfo);
final ServiceInfo svcInfo = createServiceInfoFromIServiceInfo(serviceInfo);
checkServiceInfo(svcInfo);
- try {
- jmdns.registerService(svcInfo);
- } catch (final IOException e) {
- throw new ECFException(Messages.JMDNSDiscoveryContainer_EXCEPTION_REGISTER_SERVICE, e);
- }
+ try {
+ jmdns.registerService(svcInfo);
+ } catch (final IOException e) {
+ throw new ECFException(Messages.JMDNSDiscoveryContainer_EXCEPTION_REGISTER_SERVICE, e);
+ }
}
/* (non-Javadoc)
@@ -272,7 +272,7 @@ public class JMDNSDiscoveryContainer extends AbstractDiscoveryContainerAdapter i
// Else run in thread
runInThread(new Runnable() {
public void run() {
- if(getConnectedID() == null || disposed) {
+ if (getConnectedID() == null || disposed) {
return;
}
boolean added = false;
@@ -310,7 +310,7 @@ public class JMDNSDiscoveryContainer extends AbstractDiscoveryContainerAdapter i
String serviceName = arg0.getName();
IServiceInfo aServiceInfo = null;
synchronized (lock) {
- if(getConnectedID() == null && disposed) {
+ if (getConnectedID() == null || disposed) {
return;
}
// explicitly get the service to determine the naming authority (part of the service properties)
@@ -337,7 +337,7 @@ public class JMDNSDiscoveryContainer extends AbstractDiscoveryContainerAdapter i
Trace.trace(JMDNSPlugin.PLUGIN_ID, "serviceRemoved(" + arg0.getName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
runInThread(new Runnable() {
public void run() {
- if(getConnectedID() == null || disposed) {
+ if (getConnectedID() == null || disposed) {
return;
}
try {

Back to the top