Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Alexander Kuppe2012-07-19 07:06:16 +0000
committerMarkus Alexander Kuppe2012-07-19 07:06:16 +0000
commit043bc8b568db650901421a54b17fac67674e3fbf (patch)
tree1a29e79f78e395f11918f271c8efe671961a9d60
parent2800ae7dee954b2f786138060a5ea45ddc4851a9 (diff)
downloadorg.eclipse.ecf-043bc8b568db650901421a54b17fac67674e3fbf.tar.gz
org.eclipse.ecf-043bc8b568db650901421a54b17fac67674e3fbf.tar.xz
org.eclipse.ecf-043bc8b568db650901421a54b17fac67674e3fbf.zip
NEW - bug 385395: JMDNS provider shutdown fails with NPE if connect was
not successful https://bugs.eclipse.org/bugs/show_bug.cgi?id=385395
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/JMDNSDiscoveryContainer.java7
1 files changed, 5 insertions, 2 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 702926bb6..2923877d9 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
@@ -150,8 +150,11 @@ public class JMDNSDiscoveryContainer extends AbstractDiscoveryContainerAdapter i
notificationThread = null;
this.targetID = null;
serviceTypes.clear();
- jmdns.close();
- jmdns = null;
+ // @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=385395
+ if (jmdns != null) {
+ jmdns.close();
+ jmdns = null;
+ }
fireContainerEvent(new ContainerDisconnectedEvent(this.getID(), connectedID));
}
}

Back to the top