From a2287326ad947a5cc5b544da04ffaaf1c80da238 Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Fri, 29 Apr 2011 12:42:25 +0200 Subject: [PATCH] assertions added --- .../intellij/util/indexing/FileBasedIndex.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java index 3e8da841c78e..f41adec1079f 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java +++ b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java @@ -379,7 +379,11 @@ public class FileBasedIndex implements ApplicationComponent { final MapIndexStorage storage = new MapIndexStorage(IndexInfrastructure.getStorageFile(name), extension.getKeyDescriptor(), extension.getValueExternalizer(), extension.getCacheSize()); final MemoryIndexStorage memStorage = new MemoryIndexStorage(storage); final UpdatableIndex index = createIndex(name, extension, memStorage); - myIndices.put(name, new Pair, InputFilter>(index, new IndexableFilesFilter(extension.getInputFilter()))); + final InputFilter inputFilter = extension.getInputFilter(); + + assert inputFilter != null : "Index extension " + name + " must provide non-null input filter"; + + myIndices.put(name, new Pair, InputFilter>(index, new IndexableFilesFilter(inputFilter))); myUnsavedDataIndexingSemaphores.put(name, new Semaphore()); myNoLimitCheckTypes.addAll(extension.getFileTypesWithSizeLimitNotApplicable()); break; @@ -1289,13 +1293,19 @@ public class FileBasedIndex implements ApplicationComponent { private UpdatableIndex getIndex(ID indexId) { final Pair, InputFilter> pair = myIndices.get(indexId); + + assert pair != null : "Index data is absent for index " + indexId; + //noinspection unchecked - return pair != null? (UpdatableIndex)pair.getFirst() : null; + return (UpdatableIndex)pair.getFirst(); } private InputFilter getInputFilter(ID indexId) { final Pair, InputFilter> pair = myIndices.get(indexId); - return pair != null? pair.getSecond() : null; + + assert pair != null : "Index data is absent for index " + indexId; + + return pair.getSecond(); } public int getNumberOfPendingInvalidations() {