From 48460a84804e6a5f2bd2e7acee9f5f0d6822fb28 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Thu, 7 Jun 2012 15:36:22 +0400
Subject: [PATCH] A clarifying assertion

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

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 c9a8a8145de..3bc49e81a5b 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
@@ -1020,6 +1020,9 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
         if (resolverNamespaceData == null) {
             return null;
         }
+        if (resolverNamespaceData == ResolverNamespaceData.NEGATIVE) {
+            throw new IllegalStateException("This means that we are trying to create a Java package, but have a package with the same FQN defined in Kotlin");
+        }
         JavaPackageScope scope = resolverNamespaceData.memberScope;
         if (scope == null) {
             throw new IllegalStateException("fqn: " + fqName);