From c1777f28f914fd207fe4b9fa4d405868068eabb8 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Thu, 23 Jan 2014 22:02:43 +0400
Subject: [PATCH] Fix NPE in annotation deserializer

---
 .../lang/resolve/kotlin/AnnotationDescriptorDeserializer.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorDeserializer.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorDeserializer.java
index 0f51239759e..c5aec989c27 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorDeserializer.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorDeserializer.java
@@ -249,8 +249,8 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer
             return Annotations.EMPTY;
         }
 
-        Annotations annotations = new AnnotationsImpl(memberAnnotations.invoke(kotlinClass).get(signature));
-        return annotations == null ? Annotations.EMPTY : annotations;
+        List<AnnotationDescriptor> annotations = memberAnnotations.invoke(kotlinClass).get(signature);
+        return annotations == null ? Annotations.EMPTY : new AnnotationsImpl(annotations);
     }
 
     @Nullable