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

Added workaround for CoreLocalVirtualFile.getInputStream() throwing assertion error.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-06-27 23:05:39 +04:00
parent 9d90f96573
commit f11ecdc07b
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/extAnnotations/CoreAnnotationsProvider.java
+9 -1
View File
@@ -35,7 +35,10 @@ import org.jdom.JDOMException;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.io.BufferedInputStream;
import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentMap;
@@ -138,7 +141,12 @@ public class CoreAnnotationsProvider extends ExternalAnnotationsProvider {
if (!file.isValid()) continue; if (!file.isValid()) continue;
final Document document; final Document document;
try { try {
document = JDOMUtil.loadDocument(escapeAttributes(StreamUtil.readText(file.getVirtualFile().getInputStream()))); // CoreLocalVirtualFile.getInputStream() fails with AssertionError
VirtualFile virtualFile = file.getVirtualFile();
InputStream stream = "CoreLocalVirtualFile".equals(virtualFile.getClass().getSimpleName())
? new BufferedInputStream(new FileInputStream(virtualFile.getPath()))
: virtualFile.getInputStream();
document = JDOMUtil.loadDocument(escapeAttributes(StreamUtil.readText(stream)));
} }
catch (IOException e) { catch (IOException e) {