From 615330ca75952a79c4550f3b9e97b5b847813ad0 Mon Sep 17 00:00:00 2001
From: Stepan Koltsov <stepan.koltsov@jetbrains.com>
Date: Sat, 28 Apr 2012 17:43:53 +0400
Subject: [PATCH] identified can have last segment "namespace", for instance,
 javax.xml.namespace

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

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 04b3c80e3fb..0e1682c53eb 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
@@ -222,14 +222,14 @@ public class JavaDescriptorResolver {
                 throw new IllegalStateException("both psiClass and psiPackage cannot be null");
             }
 
-            if (fqName.lastSegmentIs(JvmAbi.PACKAGE_CLASS)) {
-                throw new IllegalStateException("identified cannot have last segment " + JvmAbi.PACKAGE_CLASS + ": " + fqName);
-            }
-
             this.staticMembers = staticMembers;
             this.kotlin = psiClass != null &&
                     (new PsiClassWrapper(psiClass).getJetClass().isDefined() || psiClass.getName().equals(JvmAbi.PACKAGE_CLASS));
             classOrNamespaceDescriptor = descriptor;
+
+            if (fqName.lastSegmentIs(JvmAbi.PACKAGE_CLASS) && psiClass != null && kotlin) {
+                throw new IllegalStateException("Kotlin namespace cannot have last segment " + JvmAbi.PACKAGE_CLASS + ": " + fqName);
+            }
         }
 
         protected ResolverScopeData(boolean negative) {