fixed forked tests debugging did not stop in the first sub-session

This commit is contained in:
Egor.Ushakov
2015-05-08 16:45:42 +03:00
parent 4cd2509c29
commit f093653738
2 changed files with 9 additions and 4 deletions
@@ -1769,6 +1769,7 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb
ApplicationManager.getApplication().assertIsDispatchThread(); //TODO: remove this requirement
((XDebugSessionImpl)getXdebugProcess().getSession()).reset();
myState.set(STATE_INITIAL);
myRequestManager.processDetached(this, false);
myConnection = environment.getRemoteConnection();
getManagerThread().restartIfNeeded();
createVirtualMachine(environment.getSessionName(), environment.isPollConnection());
@@ -302,10 +302,14 @@ public class XDebugSessionImpl implements XDebugSession {
disableSlaveBreakpoints(dependentBreakpointManager);
processAllBreakpoints(true, false);
myBreakpointListener = new MyBreakpointListener();
breakpointManager.addBreakpointListener(myBreakpointListener);
myDependentBreakpointListener = new MyDependentBreakpointListener();
dependentBreakpointManager.addListener(myDependentBreakpointListener);
if (myBreakpointListener == null) {
myBreakpointListener = new MyBreakpointListener();
breakpointManager.addBreakpointListener(myBreakpointListener);
}
if (myDependentBreakpointListener == null) {
myDependentBreakpointListener = new MyDependentBreakpointListener();
dependentBreakpointManager.addListener(myDependentBreakpointListener);
}
}
@Override