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

javac ast indices: do not throw exceptions to javac internals 2

Browse Source
This commit is contained in:
Dmitry Batkovich
2017-02-20 21:11:01 +03:00
parent d2a23cbd59
commit be01ebbb5f
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-builders/src/org/jetbrains/jps/backwardRefs/CompilerBackwardReferenceIndex.java
+9 -6
View File
@@ -116,17 +116,20 @@ public class CompilerBackwardReferenceIndex {
public void close() {
myLowMemoryWatcher.stop();
final CommonProcessors.FindFirstProcessor<BuildDataCorruptedException> exceptionProc =
final CommonProcessors.FindFirstProcessor<Exception> exceptionProc =
new CommonProcessors.FindFirstProcessor<>();
close(myFilePathEnumerator, exceptionProc);
close(myNameEnumerator, exceptionProc);
for (InvertedIndex<?, ?, CompiledFileData> index : myIndices.values()) {
close(index, exceptionProc);
}
final BuildDataCorruptedException exception = exceptionProc.getFoundValue();
final Exception exception = exceptionProc.getFoundValue();
if (exception != null) {
removeIndexFiles(myIndicesDir);
throw exception;
if (myRebuildRequestCause == null) {
throw new RuntimeException(exception);
}
return;
}
if (myRebuildRequestCause != null) {
removeIndexFiles(myIndicesDir);
@@ -194,16 +197,16 @@ public class CompilerBackwardReferenceIndex {
myRebuildRequestCause = e;
}
private static void close(InvertedIndex<?, ?, CompiledFileData> index, CommonProcessors.FindFirstProcessor<BuildDataCorruptedException> exceptionProcessor) {
private static void close(InvertedIndex<?, ?, CompiledFileData> index, CommonProcessors.FindFirstProcessor<Exception> exceptionProcessor) {
try {
index.dispose();
}
catch (BuildDataCorruptedException e) {
catch (RuntimeException e) {
exceptionProcessor.process(e);
}
}
private static void close(Closeable closeable, Processor<BuildDataCorruptedException> exceptionProcessor) {
private static void close(Closeable closeable, Processor<Exception> exceptionProcessor) {
//noinspection SynchronizationOnLocalVariableOrMethodParameter
synchronized (closeable) {
try {