Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Alexander Kuppe2010-06-25 07:06:05 +0000
committerMarkus Alexander Kuppe2010-06-25 07:06:05 +0000
commit0721418c98c6b87d1879421f14169aeebb5bc2c0 (patch)
tree266f18e942d55178c368dee868f638ec1082f83f
parentff75a61f8973b0ae451596f27c43a83418371396 (diff)
downloadorg.eclipse.ecf-0721418c98c6b87d1879421f14169aeebb5bc2c0.tar.gz
org.eclipse.ecf-0721418c98c6b87d1879421f14169aeebb5bc2c0.tar.xz
org.eclipse.ecf-0721418c98c6b87d1879421f14169aeebb5bc2c0.zip
NEW - bug 317919: [Discovery][DNS-SD] NPE when SRV record has no accompanying TXT records
https://bugs.eclipse.org/bugs/show_bug.cgi?id=317919
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryLocator.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryLocator.java b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryLocator.java
index 3dc02448c..ed9803f59 100644
--- a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryLocator.java
+++ b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryLocator.java
@@ -191,7 +191,8 @@ public class DnsSdDiscoveryLocator extends AbstractDiscoveryContainerAdapter {
Lookup txtQuery = new Lookup(srvRecord.getName(), Type.TXT);
txtQuery.setResolver(resolver);
Record[] txtQueryResults = txtQuery.run();
- for (int l = 0; l < txtQueryResults.length; l++) {
+ int length = txtQueryResults == null ? 0 : txtQueryResults.length;
+ for (int l = 0; l < length; l++) {
TXTRecord txtResult = (TXTRecord) txtQueryResults[l];
List strings = txtResult.getStrings();
for (Iterator itr = strings.iterator(); itr.hasNext();) {

Back to the top