azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not swallow PCE

Browse Source 
#KT-39776 Fixed
This commit is contained in:
Vladimir Dolzhenko
2021-02-19 15:04:45 +00:00
committed by Space
parent d40777c28f
commit b8d1bbdd0d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileKotlinClass.kt
+4 -3
View File
@@ -17,8 +17,8 @@
package org.jetbrains.kotlin.load.kotlin package org.jetbrains.kotlin.load.kotlin
import com.intellij.ide.highlighter.JavaClassFileType import com.intellij.ide.highlighter.JavaClassFileType
import com.intellij.openapi.diagnostic.ControlFlowException
import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.progress.ProcessCanceledException
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
import org.jetbrains.kotlin.load.kotlin.KotlinClassFinder.Result.KotlinClass import org.jetbrains.kotlin.load.kotlin.KotlinClassFinder.Result.KotlinClass
import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
@@ -73,9 +73,10 @@ class VirtualFileKotlinClass private constructor(
} }
} catch (e: FileNotFoundException) { } catch (e: FileNotFoundException) {
// Valid situation. User can delete jar file. // Valid situation. User can delete jar file.
} catch (e: ProcessCanceledException) {
// Valid situation.
} catch (e: Throwable) { } catch (e: Throwable) {
if (e is ControlFlowException) {
throw e
}
LOG.warn(renderFileReadingErrorMessage(file), e) LOG.warn(renderFileReadingErrorMessage(file), e)
} }
null null