Merge remote-tracking branch 'origin/master'

platform/platform-api/src/com/intellij/execution/process/CapturingProcessHandler.java

@@ -56,8 +56,6 @@ public class CapturingProcessHandler extends OSProcessHandler {
   
   public ProcessOutput runProcess() {
     startNotify();
-    afterStart();
-
     if (waitFor()) {
       myOutput.setExitCode(getProcess().exitValue());
     }
@@ -88,8 +86,6 @@ public class CapturingProcessHandler extends OSProcessHandler {
     }
     else {
       startNotify();
-      afterStart();
-
       if (waitFor(timeoutInMilliseconds)) {
         myOutput.setExitCode(getProcess().exitValue());
       }
@@ -103,9 +99,6 @@ public class CapturingProcessHandler extends OSProcessHandler {
     }
   }
 
-  protected void afterStart() {
-  }
-
   @Override
   public Charset getCharset() {
     if (myCharset != null) {

platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointManagerImpl.java

@@ -458,7 +458,7 @@ public class XBreakpointManagerImpl implements XBreakpointManager, PersistentSta
 
   public Set<String> getAllGroups() {
     HashSet<String> res = new HashSet<String>();
-    for (XBreakpointBase breakpoint : myBreakpoints.values()) {
+    for (XBreakpointBase breakpoint : myAllBreakpoints) {
       String group = breakpoint.getGroup();
       if (group != null) {
         res.add(group);