MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-01 19:02:13 +07:00
Code Issues Packages Projects Releases Wiki Activity

avoid NPE on progress indicator

Browse Source
This commit is contained in:
Maxim.Mossienko
2013-06-03 15:31:54 +02:00
parent cb399b623d
commit 9bcb6dc663
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java
+8 -3
View File
@@ -520,11 +520,10 @@ public class FileBasedIndexImpl extends FileBasedIndex {
@Override
public PersistentHashMap<Integer, Collection<K>> create() {
try {
ThrowableComputable<PersistentHashMap<Integer, Collection<K>>, IOException> process =
final ThrowableComputable<PersistentHashMap<Integer, Collection<K>>, IOException> process =
new ThrowableComputable<PersistentHashMap<Integer, Collection<K>>, IOException>() {
@Override
public PersistentHashMap<Integer, Collection<K>> compute() throws IOException {
ProgressManager.getInstance().getProgressIndicator().setIndeterminate(true);
return createIdToDataKeysIndex(indexId, keyDescriptor, storage);
}
};
@@ -537,7 +536,13 @@ public class FileBasedIndexImpl extends FileBasedIndex {
final ProgressIndicator currentProgress = progressManager.getProgressIndicator();
if (currentProgress == null && ApplicationManager.getApplication().isDispatchThread()) {
return progressManager.runProcessWithProgressSynchronously(
process, LangBundle.message("compacting.indices.title"), false, null);
new ThrowableComputable<PersistentHashMap<Integer, Collection<K>>, IOException>() {
@Override
public PersistentHashMap<Integer, Collection<K>> compute() throws IOException {
ProgressManager.getInstance().getProgressIndicator().setIndeterminate(true);
return process.compute();
}
}, LangBundle.message("compacting.indices.title"), false, null);
}
if (currentProgress != null) {
// reuse existing progress indicator if available