Always closing IncrementalCache after using. Fixed KannotatorJpsTest.

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java

@@ -147,7 +147,7 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade {
             Predicate<PsiFile> filesToAnalyzeCompletely,
             ModuleDescriptorImpl module,
             List<String> moduleIds,
-            File incrementalCacheDir
+            IncrementalCache incrementalCache
     ) {
         GlobalContext globalContext = ContextPackage.GlobalContext();
         TopDownAnalysisParameters topDownAnalysisParameters = TopDownAnalysisParameters.create(
@@ -162,9 +162,7 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade {
         try {
             module.addFragmentProvider(DependencyKind.BINARIES, injector.getJavaDescriptorResolver().getPackageFragmentProvider());
 
-            IncrementalCacheProvider incrementalCacheProvider = IncrementalCacheProvider.object$.getInstance();
-            if (incrementalCacheDir != null && moduleIds != null && incrementalCacheProvider != null) {
-                IncrementalCache incrementalCache = incrementalCacheProvider.getIncrementalCache(incrementalCacheDir);
+            if (incrementalCache != null && moduleIds != null) {
                 for (String moduleId : moduleIds) {
                     module.addFragmentProvider(
                             DependencyKind.SOURCES,

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalCache.kt

@@ -26,6 +26,8 @@ public trait IncrementalCache {
     public fun getRemovedPackageParts(moduleId: String, compiledSourceFilesToFqName: Map<File, String>): Collection<String>
 
     public fun getPackageData(moduleId: String, fqName: String): ByteArray?
+
+    public fun close()
 }
 
 public fun IncrementalCache.getPackagesWithRemovedFiles(moduleId: String, compiledSourceFiles: Collection<JetFile>): Collection<FqName> {

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalCacheProvider.kt

@@ -20,6 +20,7 @@ import java.io.File
 import java.util.ServiceLoader
 
 public trait IncrementalCacheProvider {
+    // IncrementalCache should be always closed after using
     public fun getIncrementalCache(baseDir: File): IncrementalCache
 
     public class object {