| commit | a3447e33a4aa22d426c87086b20d9cb4fa75ae4f | [log] [tgz] |
|---|---|---|
| author | Markus Alexander Kuppe <bugs.eclipse.org@lemmster.de> | Tue Nov 02 11:35:05 2010 +0100 |
| committer | Markus Alexander Kuppe <bugs.eclipse.org@lemmster.de> | Tue Nov 02 11:35:05 2010 +0100 |
| tree | 4c2878b3da48e5f477d4729d60425fd0fe303535 | |
| parent | e813f664b340a36718d6d7a9c64b1c2d4b4eb6a7 [diff] |
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
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 a7ff7f7..cc7a1a5 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 @@ 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)); }