From bec083b1b4b497d1dfa03f296cdd2e4426dc3f49 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@jetbrains.com>
Date: Fri, 4 Sep 2009 16:55:45 +0400
Subject: [PATCH] IDEADEV-40049

---
 .../scope/conflictResolvers/JavaMethodsConflictResolver.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/java/java-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java b/java/java-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java
index 2e3a3f2f91c5..dc9f7ad69a4c 100644
--- a/java/java-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java
+++ b/java/java-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java
@@ -246,8 +246,9 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{
   }
 
   private static Specifics checkSubtyping(PsiType type1, PsiType type2) {
-    final boolean assignable2From1 = TypeConversionUtil.isAssignable(type2, type1, false);
-    final boolean assignable1From2 = TypeConversionUtil.isAssignable(type1, type2, false);
+    boolean noBoxing = type1 instanceof PsiPrimitiveType == type2 instanceof PsiPrimitiveType;
+    final boolean assignable2From1 = noBoxing && TypeConversionUtil.isAssignable(type2, type1, false);
+    final boolean assignable1From2 = noBoxing && TypeConversionUtil.isAssignable(type1, type2, false);
     if (assignable1From2 || assignable2From1) {
       if (assignable1From2 && assignable2From1) {
         return null;