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 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;