From 1d3863fd78182897544b68b40d7fcf22fc246a12 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Wed, 1 Feb 2017 16:50:16 +0300 Subject: [PATCH] removed big assertion not necessary anymore but hurting inlining --- .../com/intellij/openapi/progress/ProgressManager.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java b/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java index 6e5117db91d6..1f79c8adec2c 100644 --- a/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java +++ b/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java @@ -15,7 +15,6 @@ */ package com.intellij.openapi.progress; -import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.CachedSingletonsRegistry; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; @@ -37,13 +36,7 @@ public abstract class ProgressManager extends ProgressIndicatorProvider { public static ProgressManager getInstance() { ProgressManager result = ourInstance; if (result == null) { - result = ServiceManager.getService(ProgressManager.class); - if (result == null) { - throw new AssertionError("ProgressManager is null; " + ApplicationManager.getApplication()); - } - else { - ourInstance = result; - } + ourInstance = result = ServiceManager.getService(ProgressManager.class); } return result; }