NEW - bug 318070: [Discovery][DNS-SD] NPE when system sets no default search path

https://bugs.eclipse.org/bugs/show_bug.cgi?id=318070

1 files changed, 2 insertions, 2 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 939bc9653..b098fda79 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
@@ -261,11 +261,11 @@ public class DnsSdDiscoveryLocator extends AbstractDiscoveryContainerAdapter {
 		if(aTargetID == null || !(aTargetID instanceof DnsSdServiceTypeID)) {
 			ResolverConfig config = new ResolverConfig();
 			Name[] searchPaths = config.searchPath();
-			if(searchPaths.length >= 0) {
+			if(searchPaths != null && searchPaths.length > 0) {
 				targetID = new DnsSdServiceTypeID();
 				targetID.setSearchPath(searchPaths);
 			} else {
-				throw new ContainerConnectException("No target id given");
+				throw new ContainerConnectException("No target id given and fallbacks failed");
 			}
 		} else {
 			targetID = (DnsSdServiceTypeID) aTargetID;