From a1378e834e7ec37763107409083f9fdf2ade0af2 Mon Sep 17 00:00:00 2001 From: Nadya Zabrodina Date: Fri, 7 Feb 2014 15:19:25 +0400 Subject: [PATCH] EA-49128 if project already disposed return default charset --- .../src/org/zmlx/hg4idea/util/HgEncodingUtil.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgEncodingUtil.java b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgEncodingUtil.java index af7d0c278c62..5afd00802594 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgEncodingUtil.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgEncodingUtil.java @@ -18,13 +18,11 @@ public class HgEncodingUtil { if (HGENCODING != null && HGENCODING.length() > 0 && Charset.isSupported(HGENCODING)) { return Charset.forName(HGENCODING); } - else { - Charset defaultCharset = EncodingProjectManager.getInstance(project).getDefaultCharset(); - if (defaultCharset != null) { - return defaultCharset; - } + Charset defaultCharset = null; + if (!project.isDisposed()) { + defaultCharset = EncodingProjectManager.getInstance(project).getDefaultCharset(); } - return Charset.defaultCharset(); + return defaultCharset != null ? defaultCharset : Charset.defaultCharset(); } @NotNull