From a95568eedf1ceec42c28d20a0f17ba3687db7cb4 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Fri, 27 May 2016 15:11:37 +0300
Subject: [PATCH] Minor, make Services#get return type nullable

---
 .../src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt  |  1 -
 .../util/src/org/jetbrains/kotlin/config/Services.kt   | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
index 0f83affcac4..66791d20f49 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
@@ -222,7 +222,6 @@ class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
     ) {
         if (IncrementalCompilation.isEnabled()) {
             val components = services.get(IncrementalCompilationComponents::class.java)
-            @Suppress("SENSELESS_COMPARISON")
             if (components != null) {
                 configuration.put(JVMConfigurationKeys.INCREMENTAL_COMPILATION_COMPONENTS, components)
             }
diff --git a/compiler/util/src/org/jetbrains/kotlin/config/Services.kt b/compiler/util/src/org/jetbrains/kotlin/config/Services.kt
index c3d4395add8..f7213c6222f 100644
--- a/compiler/util/src/org/jetbrains/kotlin/config/Services.kt
+++ b/compiler/util/src/org/jetbrains/kotlin/config/Services.kt
@@ -16,20 +16,20 @@
 
 package org.jetbrains.kotlin.config
 
-import java.util.HashMap
+import java.util.*
 
 class Services private constructor(private val map: Map<Class<*>, Any>) {
     companion object {
-        @JvmField val EMPTY: Services = Builder().build()
+        @JvmField
+        val EMPTY: Services = Builder().build()
     }
 
-    fun <T> get(interfaceClass: Class<T>): T {
+    fun <T> get(interfaceClass: Class<T>): T? {
         @Suppress("UNCHECKED_CAST")
-        return map.get(interfaceClass) as T
+        return map[interfaceClass] as T?
     }
 
     class Builder {
-
         private val map = HashMap<Class<*>, Any>()
 
         fun <T : Any> register(interfaceClass: Class<T>, implementation: T): Builder {