From 81381a206c78a7c8736f93e3d48e2cae9bfb7bae Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Thu, 21 Mar 2013 22:58:22 +0400
Subject: [PATCH] Simplified code.

---
 .../java/resolver/JavaFunctionResolver.java       | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
index 1bf163e6779..b7261b37f43 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
@@ -355,17 +355,14 @@ public final class JavaFunctionResolver {
             @NotNull PackagePsiDeclarationProvider scopeData,
             @NotNull NamespaceDescriptor ownerDescriptor
     ) {
-
         NamedMembers namedMembers = scopeData.getMembersCache().get(functionName);
-        if (namedMembers == null) {
-            return Collections.emptySet();
+        if (namedMembers != null) {
+            SimpleFunctionDescriptor samConstructor = resolveSamConstructor(ownerDescriptor, namedMembers);
+            if (samConstructor != null) {
+                return Collections.<FunctionDescriptor>singleton(samConstructor);
+            }
         }
-
-        SimpleFunctionDescriptor samConstructor = resolveSamConstructor(ownerDescriptor, namedMembers);
-
-        return samConstructor == null
-               ? Collections.<FunctionDescriptor>emptySet()
-               : Collections.<FunctionDescriptor>singleton(samConstructor);
+        return Collections.emptySet();
     }
 
     @NotNull