From c898a04f05d6a4fe0956d4528825e196e08a80e8 Mon Sep 17 00:00:00 2001
From: Anton Tarasov <anton.tarasov@jetbrains.com>
Date: Tue, 29 Nov 2016 16:07:49 +0300
Subject: [PATCH] Fix IAE caused by EmptyIcon.hashCode()

https://ea.jetbrains.com/browser/ea_problems/92304
---
 platform/util/src/com/intellij/util/ui/EmptyIcon.java | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/platform/util/src/com/intellij/util/ui/EmptyIcon.java b/platform/util/src/com/intellij/util/ui/EmptyIcon.java
index d16d4a173314..e755d922a7b6 100644
--- a/platform/util/src/com/intellij/util/ui/EmptyIcon.java
+++ b/platform/util/src/com/intellij/util/ui/EmptyIcon.java
@@ -157,18 +157,16 @@ public class EmptyIcon extends JBUI.CachingScalableJBIcon<EmptyIcon> {
 
     final EmptyIcon icon = (EmptyIcon)o;
 
-    if (scaleVal(height, Scale.JBUI) != icon.scaleVal(height, Scale.JBUI)) return false;
-    if (scaleVal(width, Scale.JBUI) != icon.scaleVal(width, Scale.JBUI)) return false;
-    if (getScale() != icon.getScale()) return false;
+    if (scaleVal(height, Scale.EFFECTIVE) != icon.scaleVal(height, Scale.EFFECTIVE)) return false;
+    if (scaleVal(width, Scale.EFFECTIVE) != icon.scaleVal(width, Scale.EFFECTIVE)) return false;
 
     return true;
   }
 
   @Override
   public int hashCode() {
-    int result = scaleVal(width, Scale.JBUI);
-    result = 31 * result + scaleVal(height, Scale.JBUI);
-    result = 31 * result + (getScale() != +0.0f ? Float.floatToIntBits(getScale()) : 0);
+    int result = scaleVal(width, Scale.EFFECTIVE);
+    result = 31 * result + scaleVal(height, Scale.EFFECTIVE);
     return result;
   }