From 60a2151a335e3cae08b40cede51d49cade84967c Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 13 Dec 2016 18:32:51 +0100
Subject: [PATCH] Fix compilation

(cherry picked from commit 46b9041)
---
 .../jetbrains/kotlin/idea/reporter/KotlinReportSubmitter.kt   | 4 ++--
 .../idea/resolve/AbstractReferenceResolveWithLibTest.java     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/reporter/KotlinReportSubmitter.kt b/idea/src/org/jetbrains/kotlin/idea/reporter/KotlinReportSubmitter.kt
index c11c0f6d86a..05193d44efd 100644
--- a/idea/src/org/jetbrains/kotlin/idea/reporter/KotlinReportSubmitter.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/reporter/KotlinReportSubmitter.kt
@@ -33,9 +33,9 @@ class KotlinReportSubmitter : ITNReporter() {
     private var hasUpdate = false
     private var hasLatestVersion = false
 
-    override fun showErrorInRelease(event: IdeaLoggingEvent?) = !hasUpdate
+    override fun showErrorInRelease(event: IdeaLoggingEvent) = !hasUpdate
 
-    override fun submit(events: Array<out IdeaLoggingEvent>, additionalInfo: String?, parentComponent: Component, consumer: Consumer<SubmittedReportInfo>): Boolean {
+    override fun submit(events: Array<IdeaLoggingEvent>, additionalInfo: String?, parentComponent: Component, consumer: Consumer<SubmittedReportInfo>): Boolean {
         if (hasUpdate) {
             return true
         }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveWithLibTest.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveWithLibTest.java
index d03f531d2ac..5f12eb38e4e 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveWithLibTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveWithLibTest.java
@@ -51,7 +51,7 @@ public abstract class AbstractReferenceResolveWithLibTest extends AbstractRefere
             @Nullable
             @Override
             public PsiElement resolve() {
-                return AstAccessControl.INSTANCE.execute(false, myTestRootDisposable, myFixture, new Function0<PsiElement>() {
+                return AstAccessControl.INSTANCE.execute(false, getTestRootDisposable(), myFixture, new Function0<PsiElement>() {
                     @Override
                     public PsiElement invoke() {
                         return reference.resolve();