From 06160d55558dc586cc06f97f17f87a4036404244 Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Fri, 18 Jan 2013 16:41:50 +0100 Subject: [PATCH] [r=Peter.Gromov] tolerate null key for get and containsKey --- .../util/src/com/intellij/util/containers/RefHashMap.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/platform/util/src/com/intellij/util/containers/RefHashMap.java b/platform/util/src/com/intellij/util/containers/RefHashMap.java index cba8230bdd72..057b96604e60 100644 --- a/platform/util/src/com/intellij/util/containers/RefHashMap.java +++ b/platform/util/src/com/intellij/util/containers/RefHashMap.java @@ -185,7 +185,8 @@ abstract class RefHashMap extends AbstractMap implements Map { } @Override - public boolean containsKey(@NotNull Object key) { + public boolean containsKey(Object key) { + if (key == null) return false; // optimization: myHardKeyInstance.set((K)key); boolean result = myMap.containsKey(myHardKeyInstance); @@ -194,7 +195,8 @@ abstract class RefHashMap extends AbstractMap implements Map { } @Override - public V get(@NotNull Object key) { + public V get(Object key) { + if (key == null) return null; myHardKeyInstance.set((K)key); V result = myMap.get(myHardKeyInstance); myHardKeyInstance.clear();