commit ecd47ecd8ccd066a452bb40d3e4a79276c87e5c3
author Andrei Korzhevskii <a.korzhevskiy@gmail.com> Wed Jun 11 03:18:15 2014 +0400
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 10 21:15:29 2014 +0000
tree c5bcf0093a11a043ad1f3b6f7ee732bd3301add7
parent 0f058d23fb4a73ccaa931d265e93b5763379622a

Adds @SpecializeMethod to AbstractHashMap.containsKey()

Change-Id: I1fc3919131da6f5f5b7434e19c176c506501b3d8

user/super/com/google/gwt/emul/java/util/AbstractHashMap.java

diff --git a/user/super/com/google/gwt/emul/java/util/AbstractHashMap.java b/user/super/com/google/gwt/emul/java/util/AbstractHashMap.java
index a186c98..3fa35b4 100644
--- a/user/super/com/google/gwt/emul/java/util/AbstractHashMap.java
+++ b/user/super/com/google/gwt/emul/java/util/AbstractHashMap.java
@@ -211,6 +211,7 @@
     clearImpl();
   }
 
+  @SpecializeMethod(params = {String.class}, target = "hasStringValue")
   @Override
   public boolean containsKey(Object key) {
     return (key == null) ? nullSlotLive : (!(key instanceof String)
@@ -413,7 +414,10 @@
   /**
    * Returns true if the given key exists in the stringMap.
    */
-  private native boolean hasStringValue(String key) /*-{
+  protected native boolean hasStringValue(String key) /*-{
+    if (key == null) {
+      return this.@java.util.AbstractHashMap::nullSlotLive;
+    }
     return (':' + key) in this.@java.util.AbstractHashMap::stringMap;
   }-*/;