Bug 362849 - AssertionFailedException in RetargetBreakpointAction

2 files changed, 6 insertions, 2 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java
index c0903ae72..75eb0fc2d 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java
@@ -1327,7 +1327,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener {
 	 * {@link IEvaluationService} can be acquired, otherwise the new context is created with no 
 	 * parent context
 	 * 
-	 * @param defaultvar the default variable for the new context
+	 * @param defaultvar the default variable for the new context (cannot be <code>null</code>).
 	 * @return a new {@link IEvaluationContext}
 	 * @since 3.7
 	 */
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RetargetBreakpointAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RetargetBreakpointAction.java
index ba626f833..ec404b9ba 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RetargetBreakpointAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RetargetBreakpointAction.java
@@ -41,7 +41,11 @@ public abstract class RetargetBreakpointAction extends RetargetAction implements
 	
     protected Object getAdapter(IAdaptable adaptable) {
         ToggleBreakpointsTargetManager manager = ToggleBreakpointsTargetManager.getDefault();
-        return manager.getToggleBreakpointsTarget(getActivePart(), getTargetSelection());
+        IPart activePart = getActivePart();
+        if (activePart != null) {
+            return manager.getToggleBreakpointsTarget(getActivePart(), getTargetSelection());
+        }
+        return null;
     }
 
     public void init(IWorkbenchWindow window) {