MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

EA-49128 if project already disposed return default charset

Browse Source
This commit is contained in:
Nadya Zabrodina
2014-02-07 15:20:25 +04:00
parent 89bdb116ff
commit a1378e834e
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/hg4idea/src/org/zmlx/hg4idea/util/HgEncodingUtil.java
+4 -6
View File
@@ -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