From ce0565b4494d1fc6d6d9da9f5d021893e729a1e8 Mon Sep 17 00:00:00 2001
From: Stepan Koltsov <stepan.koltsov@jetbrains.com>
Date: Sun, 8 Apr 2012 22:26:15 +0400
Subject: [PATCH] exclude JetJavaMirrorMaker in PsiClassFinder

---
 .../jet/lang/resolve/java/JavaDescriptorResolver.java      | 7 +------
 .../jet/lang/resolve/java/PsiClassFinderForJvm.java        | 4 ++++
 2 files changed, 5 insertions(+), 6 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 5504e14bcca..0be61746ec1 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
@@ -965,12 +965,7 @@ public class JavaDescriptorResolver {
 
     @Nullable
     private PsiClass getPsiClassForJavaPackageScope(@NotNull FqName packageFQN) {
-        PsiClass psiClass = psiClassFinder.findPsiClass(packageFQN.child(JvmAbi.PACKAGE_CLASS));
-        if (psiClass instanceof JetJavaMirrorMarker) {
-            return null;
-        } else {
-            return psiClass;
-        }
+        return psiClassFinder.findPsiClass(packageFQN.child(JvmAbi.PACKAGE_CLASS));
     }
 
     @NotNull
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinderForJvm.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinderForJvm.java
index 08569c82070..dc20e415340 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinderForJvm.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinderForJvm.java
@@ -94,6 +94,10 @@ public class PsiClassFinderForJvm implements PsiClassFinder {
             }
         }
 
+        if (result instanceof JetJavaMirrorMarker) {
+            return null;
+        }
+
         return result;
     }