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

[index] MapReduceIndex does not necessarily have inputs index

Browse Source 
Add some Nullable annotations, fix possible NPE.
This commit is contained in:
Julia Beliaeva
2016-11-10 20:12:25 +03:00
parent a0f3556ad4
commit 06994471b5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/util/indexing/MapReduceIndex.java
+4 -4
View File
@@ -72,7 +72,7 @@ public class MapReduceIndex<Key, Value, Input> implements UpdatableIndex<Key,Val
private PersistentHashMap<Integer, ByteSequence> myContents;
private PersistentHashMap<Integer, Integer> myInputsSnapshotMapping;
protected PersistentHashMap<Integer, Collection<Key>> myInputsIndex;
@Nullable protected PersistentHashMap<Integer, Collection<Key>> myInputsIndex;
private PersistentHashMap<Integer, String> myIndexingTrace;
private final ReentrantReadWriteLock myLock = new ReentrantReadWriteLock();
@@ -305,7 +305,7 @@ public class MapReduceIndex<Key, Value, Input> implements UpdatableIndex<Key,Val
}
}
private static void doForce(PersistentHashMap<?, ?> inputsIndex) {
private static void doForce(@Nullable PersistentHashMap<?, ?> inputsIndex) {
if (inputsIndex != null && inputsIndex.isDirty()) {
inputsIndex.force();
}
@@ -350,7 +350,7 @@ public class MapReduceIndex<Key, Value, Input> implements UpdatableIndex<Key,Val
return IndexingStamp.isFileIndexedStateCurrent(fileId, myIndexId);
}
private static void doClose(PersistentHashMap<?, ?> index) {
private static void doClose(@Nullable PersistentHashMap<?, ?> index) {
if (index != null) {
try {
index.close();
@@ -703,7 +703,7 @@ public class MapReduceIndex<Key, Value, Input> implements UpdatableIndex<Key,Val
}
return keys;
}
return myInputsIndex.get(inputId);
return myInputsIndex != null ? myInputsIndex.get(inputId) : null;
}
private void saveInputKeys(int inputId, int savedInputId, Map<Key, Value> newData) throws IOException {