summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPawel Piech2012-12-05 18:11:29 (EST)
committer Elena Laskavaia2012-12-06 20:33:03 (EST)
commitb2238a81f489d728d8bea2cec1aded0208c372ce (patch)
treefd508e5c2cd395ab8ad54455defa6d8c91afe99e
parentf2d8b90495f81fa69c619904169263ff0cacc484 (diff)
downloadorg.eclipse.cdt-b2238a81f489d728d8bea2cec1aded0208c372ce.zip
org.eclipse.cdt-b2238a81f489d728d8bea2cec1aded0208c372ce.tar.gz
org.eclipse.cdt-b2238a81f489d728d8bea2cec1aded0208c372ce.tar.bz2
Bug 395873 - [breakpoints] breakpointContribution conditional contribution doesn't check for missing propertyrefs/changes/50/9050/2
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;