commit 541858e051fbb05f1cd296b6d71935a22d713c4a
author Goktug Gokdogan <goktug@google.com> Wed Jul 22 15:39:22 2015 -0700
committer Goktug Gokdogan <goktug@google.com> Wed Jul 22 18:34:45 2015 -0700
tree 9ab39163485e18dd950dbb610be74e3b8fbf0075
parent d8a0798b5af53d6ea27c70ec6fd4a474443c8870

Improve Map feature check.

This helps us to avoid hitting legacy Map implementations
that use different iteration protocol (i.e. Firefox 24).

Change-Id: Ie6542e4c6fba4bb23fc63c7a9bcf4f256bce73b5

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

diff --git a/user/super/com/google/gwt/emul/java/util/InternalJsMapFactory.java b/user/super/com/google/gwt/emul/java/util/InternalJsMapFactory.java
index e4e5598..63f98ba 100644
--- a/user/super/com/google/gwt/emul/java/util/InternalJsMapFactory.java
+++ b/user/super/com/google/gwt/emul/java/util/InternalJsMapFactory.java
@@ -25,7 +25,16 @@
   private static final JavaScriptObject jsMapCtor = getJsMapConstructor();
 
   private static native JavaScriptObject getJsMapConstructor() /*-{
-    if (typeof Map === 'function' && Map.prototype.entries) {
+    // Firefox 24 & 25 throws StopIteration to signal the end of iteration.
+    function isCorrectIterationProtocol() {
+      try {
+        return new Map().entries().next().done;
+      } catch(e) {
+        return false;
+      }
+    }
+
+    if (typeof Map === 'function' && Map.prototype.entries && isCorrectIterationProtocol()) {
       return Map;
     } else {
       return @InternalJsMapFactory::getJsMapPolyFill()();