From 4ff3235a2be7b87f4cab514f416981813fd3d5f7 Mon Sep 17 00:00:00 2001 From: "Denis.Zhdanov" Date: Mon, 12 Dec 2011 12:59:09 +0400 Subject: [PATCH] Don't process disposed editor (the commit is triggered by the reported exception) --- .../openapi/fileEditor/impl/EditorHistoryManager.java | 2 +- .../openapi/fileEditor/impl/text/TextEditorComponent.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorHistoryManager.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorHistoryManager.java index a6d987f4f0ff..2585c25ab461 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorHistoryManager.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorHistoryManager.java @@ -154,7 +154,7 @@ public final class EditorHistoryManager extends AbstractProjectComponent impleme @Nullable FileEditorProvider fallbackProvider, final boolean changeEntryOrderOnly) { - if (file == null){ + if (file == null) { return; } final FileEditorManagerEx editorManager = FileEditorManagerEx.getInstanceEx(myProject); diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java index 35aceb5940a1..5bd2ae4b5407 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2011 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -230,7 +230,7 @@ class TextEditorComponent extends JPanel implements DataProvider{ * @return whether the editor is valid or not */ boolean isEditorValid(){ - return myValid; + return myValid && !myEditor.isDisposed(); } /**