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

[java decompiler] return empty string on I/O errors (EA-102308)

Browse Source 
Compatible with LoadTextUtil.loadText().
This commit is contained in:
Roman Shevchenko
2018-03-21 11:43:10 +01:00
parent 2444cc9165
commit 4cf749d80a
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/java-decompiler/plugin/src/org/jetbrains/java/decompiler/IdeaDecompiler.kt
+7
View File
@@ -9,6 +9,7 @@ import com.intellij.ide.plugins.PluginManagerCore
import com.intellij.ide.util.PropertiesComponent
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.application.ex.ApplicationManagerEx
import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.fileEditor.FileEditorManager
import com.intellij.openapi.fileEditor.FileEditorManagerListener
import com.intellij.openapi.fileTypes.StdFileTypes
@@ -29,6 +30,7 @@ import com.intellij.psi.impl.compiled.ClsFileImpl
import com.intellij.ui.Gray
import com.intellij.ui.components.JBLabel
import com.intellij.ui.components.JBPanel
import com.intellij.util.ArrayUtil
import com.intellij.util.containers.ContainerUtil
import com.intellij.util.ui.JBUI
import com.intellij.util.ui.UIUtil
@@ -38,6 +40,7 @@ import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences
import org.jetbrains.java.decompiler.main.extern.IResultSaver
import java.awt.BorderLayout
import java.io.File
import java.io.IOException
import java.util.*
import java.util.concurrent.Callable
import java.util.concurrent.Future
@@ -165,6 +168,10 @@ class IdeaDecompiler : ClassFileDecompilers.Light() {
throw e
}
catch (e: Exception) {
if (e is IdeaLogger.InternalException && e.cause is IOException) {
Logger.getInstance(IdeaDecompiler::class.java).warn(file.url, e)
return ArrayUtil.EMPTY_CHAR_SEQUENCE
}
if (ApplicationManager.getApplication().isUnitTestMode) {
throw AssertionError(file.url, e)
}