From 968d159f8652926857728957900f9c2e3b27f095 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Mon, 4 Jun 2012 18:44:32 +0400
Subject: [PATCH] Fixed NPE when no type ref is specified in Kotlin signature.

---
 .../jet/lang/resolve/java/JavaDescriptorResolver.java        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
index 331b499e53e..c6c3c19bbea 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
@@ -1675,7 +1675,10 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
         if (!signature.isEmpty()) {
             JetNamedFunction altFunDeclaration = JetPsiFactory.createFunction(project, signature);
             valueParameterDescriptors = computeAlternativeValueParameters(valueParameterDescriptors, altFunDeclaration);
-            returnType = computeAlternativeTypeFromAnnotation(altFunDeclaration.getReturnTypeRef().getTypeElement(), returnType);
+            JetTypeReference returnTypeRef = altFunDeclaration.getReturnTypeRef();
+            if (returnTypeRef != null) {
+                returnType = computeAlternativeTypeFromAnnotation(returnTypeRef.getTypeElement(), returnType);
+            }
         }
 
         functionDescriptorImpl.initialize(