Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Alexander Kuppe2010-06-26 11:25:12 +0000
committerMarkus Alexander Kuppe2010-06-26 11:25:12 +0000
commitb3cedceb7767b6c09cbe5a087895df48ae529af5 (patch)
tree1b1ebcf8e0325be36b8cfd0ff431f88122b5d583
parent3afbfa256cd03db8283d137e69fd97e41a5f1765 (diff)
downloadorg.eclipse.ecf-b3cedceb7767b6c09cbe5a087895df48ae529af5.tar.gz
org.eclipse.ecf-b3cedceb7767b6c09cbe5a087895df48ae529af5.tar.xz
org.eclipse.ecf-b3cedceb7767b6c09cbe5a087895df48ae529af5.zip
NEW - bug 318074: [Discovery][DNS-SD] NPE in test comparator when expected property is missing
https://bugs.eclipse.org/bugs/show_bug.cgi?id=318074
-rw-r--r--tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/DnsSdAdvertiserComparator.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/DnsSdAdvertiserComparator.java b/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/DnsSdAdvertiserComparator.java
index d7b5a276c..2f0637ea1 100644
--- a/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/DnsSdAdvertiserComparator.java
+++ b/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/DnsSdAdvertiserComparator.java
@@ -49,7 +49,11 @@ public class DnsSdAdvertiserComparator implements Comparator {
final String key = str[0].substring(1);
final String value = str[1].substring(0, str[1].length() - 1);
final Object property = serviceInfo.getServiceProperties().getProperty(key);
- result += value.equals(property.toString()) ? 1 : -1;
+ if(property != null) {
+ result += value.equals(property.toString()) ? 1 : -1;
+ } else {
+ result += -1;
+ }
}
}
}

Back to the top