extra fix for IDEA-128124
authorEgor.Ushakov <egor.ushakov@jetbrains.com>
Wed, 12 Aug 2015 17:16:51 +0000 (20:16 +0300)
committerEgor.Ushakov <egor.ushakov@jetbrains.com>
Wed, 12 Aug 2015 17:19:16 +0000 (20:19 +0300)
java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java

index 88fad3982f82a48b8c0a86ef3c5e01d69ff8451b..9a00addc88d282e852639c12d1b8ebf550933fe4 100644 (file)
@@ -1605,22 +1605,19 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb
       myRunToCursorBreakpoint.createRequest(debugProcess);
       DebugProcessImpl.this.myRunToCursorBreakpoint = myRunToCursorBreakpoint;
 
       myRunToCursorBreakpoint.createRequest(debugProcess);
       DebugProcessImpl.this.myRunToCursorBreakpoint = myRunToCursorBreakpoint;
 
-      if (debugProcess.getRequestsManager().getWarning(myRunToCursorBreakpoint) == null) {
-        super.contextAction();
-      }
-      else {
-        myDebugProcessDispatcher.getMulticaster().resumed(getSuspendContext());
+      if (debugProcess.getRequestsManager().getWarning(myRunToCursorBreakpoint) != null) {
         DebuggerInvocationUtil.swingInvokeLater(myProject, new Runnable() {
           @Override
           public void run() {
             SourcePosition position = myRunToCursorBreakpoint.getSourcePosition();
             String name = position != null ? position.getFile().getName() : "<No File>";
             Messages.showErrorDialog(
         DebuggerInvocationUtil.swingInvokeLater(myProject, new Runnable() {
           @Override
           public void run() {
             SourcePosition position = myRunToCursorBreakpoint.getSourcePosition();
             String name = position != null ? position.getFile().getName() : "<No File>";
             Messages.showErrorDialog(
-              DebuggerBundle.message("error.running.to.cursor.no.executable.code", name, myRunToCursorBreakpoint.getLineIndex()+1),
+              DebuggerBundle.message("error.running.to.cursor.no.executable.code", name, myRunToCursorBreakpoint.getLineIndex() + 1),
               UIUtil.removeMnemonic(ActionsBundle.actionText(XDebuggerActions.RUN_TO_CURSOR)));
           }
         });
       }
               UIUtil.removeMnemonic(ActionsBundle.actionText(XDebuggerActions.RUN_TO_CURSOR)));
           }
         });
       }
+      super.contextAction();
     }
   }
 
     }
   }