From b2238a81f489d728d8bea2cec1aded0208c372ce Mon Sep 17 00:00:00 2001
From: Pawel Piech <pawel.piech@windriver.com>
Date: Wed, 5 Dec 2012 15:11:29 -0800
Subject: [PATCH] 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>
---
 .../breakpoints/DefaultCBreakpointUIContribution.java | 11 ++++-------
 1 file 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 00d5b6107ba..ce5529ed9ab 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;