From 0ab6b68ebc7eee8813c0b3e9919e66ea1bdc42fc Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Mon, 31 Oct 2016 12:16:59 +0100
Subject: [PATCH] BreakpointManager.loadState: avoid exception from TaskVcsTest
 tearDown

---
 .../debugger/ui/breakpoints/BreakpointManager.java         | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointManager.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointManager.java
index 592b9f262973..85a86a1ac04e 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointManager.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointManager.java
@@ -307,12 +307,7 @@ public class BreakpointManager {
     for (Element element : parentNode.getChildren()) {
       myOriginalBreakpointsNodes.put(element.getName(), element.clone());
     }
-    if (myProject.isOpen()) {
-      doRead(parentNode);
-    }
-    else {
-      myStartupManager.registerPostStartupActivity(() -> doRead(parentNode));
-    }
+    myStartupManager.runWhenProjectIsInitialized(() -> doRead(parentNode));
   }
 
   private void doRead(@NotNull final Element parentNode) {
-- 
2.32.0