From 3014275982b7d42c57094397327a2b34be067d72 Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Thu, 7 Feb 2013 21:02:59 +0400
Subject: [PATCH] return commit after merge 'Fixed
 UnsupportedOperationException when a namespace is used in place of an
 expression.'

---
 .../jet/lang/resolve/calls/CallExpressionResolver.java         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java
index e8a810ca12d..105d6802e91 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java
@@ -218,6 +218,9 @@ public class CallExpressionResolver {
         JetType type = getVariableType(nameExpression, receiver, callOperationNode, context.replaceBindingTrace(traceForVariable), result);
         if (result[0]) {
             traceForVariable.commit();
+            if (type instanceof NamespaceType && !context.namespacesAllowed) {
+                type = null;
+            }
             return JetTypeInfo.create(type, context.dataFlowInfo);
         }