diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 0f4dba2d2c0..278f523179b 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-26 Mikhail Khodjaiants
+	Extracted the main part of the 'breakpointAdded' method into a separate method to avoid 
+	double checking.
+	* CDebugTarget.java
+
 2003-11-26 Mikhail Khodjaiants
 	Cleanup.
 	* CDebugModel.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
index 0979d5292c3..ef3721227a3 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
@@ -357,7 +357,7 @@ public class CDebugTarget extends CDebugElement
 					{
 					}
 				}
-				breakpointAdded( bps[i] );
+				breakpointAdded0( bps[i] );
 			}
 		}
 	}
@@ -679,6 +679,13 @@ public class CDebugTarget extends CDebugElement
 			 !getBreakpointManager().isTargetBreakpoint( (ICBreakpoint)breakpoint ) || 
 			 !isAvailable() )
 			return;
+		breakpointAdded0( breakpoint );
+	}
+
+	private void breakpointAdded0( IBreakpoint breakpoint )
+	{
+		if ( !isAvailable() )
+			return;
 		if ( breakpoint instanceof ICAddressBreakpoint && !getBreakpointManager().supportsAddressBreakpoint( (ICAddressBreakpoint)breakpoint ) )
 			return;
 		if ( getConfiguration().supportsBreakpoints() )