Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Alexander Kuppe2010-11-02 10:35:05 +0000
committerMarkus Alexander Kuppe2010-11-02 10:35:05 +0000
commita3447e33a4aa22d426c87086b20d9cb4fa75ae4f (patch)
tree4c2878b3da48e5f477d4729d60425fd0fe303535
parente813f664b340a36718d6d7a9c64b1c2d4b4eb6a7 (diff)
downloadorg.eclipse.ecf-a3447e33a4aa22d426c87086b20d9cb4fa75ae4f.tar.gz
org.eclipse.ecf-a3447e33a4aa22d426c87086b20d9cb4fa75ae4f.tar.xz
org.eclipse.ecf-a3447e33a4aa22d426c87086b20d9cb4fa75ae4f.zip
RESOLVED - bug 329247: [Discovery][DNS-SD] NPE in org.eclipse.ecf.provider.dnssd.DnsSdDiscoveryContainerAdapter.getSRVRecord(Lookup, Comparator) when record not PTR or SRV record
https://bugs.eclipse.org/bugs/show_bug.cgi?id=329247
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryContainerAdapter.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryContainerAdapter.java b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryContainerAdapter.java
index a7ff7f77a..cc7a1a53b 100644
--- a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryContainerAdapter.java
+++ b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryContainerAdapter.java
@@ -226,6 +226,9 @@ public abstract class DnsSdDiscoveryContainerAdapter extends
srvQueryResult = srvQuery.run();
} else if (record instanceof SRVRecord) {
srvQueryResult = new SRVRecord[]{(SRVRecord) record};
+ } else {
+ // avoid NPE
+ srvQueryResult = new SRVRecord[0];
}
srvRecords.addAll(Arrays.asList(srvQueryResult));
}

Back to the top