From 34a9d6a4697bd97aed4801c73f8dd112758df1d3 Mon Sep 17 00:00:00 2001
From: "Natalia.Ukhorskaya" <natalia.ukhorskaya@jetbrains.com>
Date: Wed, 24 Oct 2012 12:28:58 +0400
Subject: [PATCH] EA-39486 Fixed - IAE:
 AnnotationResolver.resolveAnnotationArgument

---
 .../jet/lang/resolve/AnnotationResolver.java          | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java
index b5cf22520c1..2088de85011 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java
@@ -120,10 +120,13 @@ public class AnnotationResolver {
             List<ValueArgument> valueArguments = descriptorToArgument.getValue().getArguments();
             ValueParameterDescriptor parameterDescriptor = descriptorToArgument.getKey();
             for (ValueArgument argument : valueArguments) {
-                CompileTimeConstant<?> compileTimeConstant =
-                        resolveAnnotationArgument(argument.getArgumentExpression(), parameterDescriptor.getType(), trace);
-                if (compileTimeConstant != null) {
-                    descriptor.setValueArgument(parameterDescriptor, compileTimeConstant);
+                JetExpression argumentExpression = argument.getArgumentExpression();
+                if (argumentExpression != null) {
+                    CompileTimeConstant<?> compileTimeConstant =
+                            resolveAnnotationArgument(argumentExpression, parameterDescriptor.getType(), trace);
+                    if (compileTimeConstant != null) {
+                        descriptor.setValueArgument(parameterDescriptor, compileTimeConstant);
+                    }
                 }
             }
         }