summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPawel Piech2012-12-05 18:11:29 (EST)
committerPawel Piech2012-12-11 13:53:54 (EST)
commit7688890668f8426f6e0de0c6bf23d906ba3e7fb1 (patch)
treefdf77f57c893efc26038e08a91a19ae1d6adc15d
parent4bc1cfe0d5e814479a7bd1bc3837251d14345843 (diff)
downloadorg.eclipse.cdt-7688890668f8426f6e0de0c6bf23d906ba3e7fb1.zip
org.eclipse.cdt-7688890668f8426f6e0de0c6bf23d906ba3e7fb1.tar.gz
org.eclipse.cdt-7688890668f8426f6e0de0c6bf23d906ba3e7fb1.tar.bz2
Bug 395873 - [breakpoints] breakpointContribution conditional contribution doesn't check for missing property
Change-Id: If75c23f393c1fc983de1ddd4ddea3b003c1ec1b3 Reviewed-on: https://git.eclipse.org/r/9050 Reviewed-by: Mikhail Khodjaiants <mikhailkhod@googlemail.com> IP-Clean: Mikhail Khodjaiants <mikhailkhod@googlemail.com> Tested-by: Mikhail Khodjaiants <mikhailkhod@googlemail.com> Reviewed-by: Elena Laskavaia <elaskavaia.cdt@gmail.com>
-rw-r--r--debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/DefaultCBreakpointUIContribution.java11
1 files changed, 4 insertions, 7 deletions
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/DefaultCBreakpointUIContribution.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/DefaultCBreakpointUIContribution.java
index 00d5b61..ce5529e 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/DefaultCBreakpointUIContribution.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/DefaultCBreakpointUIContribution.java
@@ -124,13 +124,10 @@ class DefaultCBreakpointUIContribution implements ICBreakpointsUIContribution {
@Override
public boolean isApplicable(Map<String, Object> properties) {
- for (Object key : properties.keySet()) {
- String value = conditions.get(key);
- if (value != null) {
- String realValue = (String) properties.get(key);
- if (!value.equals(realValue)) {
- return false;
- }
+ for (Object key : conditions.keySet()) {
+ Object bpValue = properties.get(key);
+ if ( bpValue == null || !bpValue.equals(conditions.get(key)) ) {
+ return false;
}
}
return true;