diff options
author | Pawel Piech | 2011-11-03 22:36:51 +0000 |
---|---|---|
committer | Pawel Piech | 2011-11-03 22:36:51 +0000 |
commit | 10d115a56d8e361de6cc36e3f46f6bf841c1e35b (patch) | |
tree | 9783146b7cd11c7be685cc297488b9d1e9baf7b6 /org.eclipse.debug.ui/ui | |
parent | 2c9488da649bd0f8a92dcc07ce314f109dc20622 (diff) | |
download | eclipse.platform.debug-10d115a56d8e361de6cc36e3f46f6bf841c1e35b.tar.gz eclipse.platform.debug-10d115a56d8e361de6cc36e3f46f6bf841c1e35b.tar.xz eclipse.platform.debug-10d115a56d8e361de6cc36e3f46f6bf841c1e35b.zip |
Bug 362849 - AssertionFailedException in RetargetBreakpointAction
Diffstat (limited to 'org.eclipse.debug.ui/ui')
-rw-r--r-- | org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java | 2 | ||||
-rw-r--r-- | org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RetargetBreakpointAction.java | 6 |
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) { |