From 3c083c83e26865736bea56e356942641a517d254 Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Mon, 10 Sep 2012 20:49:46 +0400
Subject: [PATCH] alternative signature applicability check changed

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

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AlternativeSignatureData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AlternativeSignatureData.java
index 158596e02ae..0af86ba25d1 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AlternativeSignatureData.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AlternativeSignatureData.java
@@ -128,7 +128,7 @@ class AlternativeSignatureData {
         return altTypeParameters;
     }
 
-    JetType computeType(JetTypeElement alternativeTypeElement, final JetType autoType) {
+    private JetType computeType(JetTypeElement alternativeTypeElement, final JetType autoType) {
         //noinspection NullableProblems
         return alternativeTypeElement.accept(new JetVisitor<JetType, Void>() {
             @Override
@@ -173,7 +173,7 @@ class AlternativeSignatureData {
                 ClassifierDescriptor declarationDescriptor = originalTypeConstructor.getDeclarationDescriptor();
                 assert declarationDescriptor != null;
                 String fqName = DescriptorUtils.getFQName(declarationDescriptor).toSafe().getFqName();
-                if (!fqName.endsWith(expectedFqNamePostfix)) {
+                if (!fqName.equals(expectedFqNamePostfix) && !fqName.endsWith("." + expectedFqNamePostfix)) {
                     fail("Alternative signature type mismatch, expected: %s, actual: %s", expectedFqNamePostfix, fqName);
                 }