1 files changed, 13 insertions, 1 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/FastStringSet.java b/src/com/vaadin/terminal/gwt/client/FastStringSet.java
index b5b4b8dc1d..05ed8addc8 100644
--- a/src/com/vaadin/terminal/gwt/client/FastStringSet.java
+++ b/src/com/vaadin/terminal/gwt/client/FastStringSet.java
@@ -32,7 +32,9 @@ public final class FastStringSet extends JavaScriptObject {
     /*-{
         var array = [];
         for(var string in this) {
-            array.push(string);
+            if (this.hasOwnProperty(string)) {
+                array.push(string);
+            }
         }
         return array;
     }-*/;
@@ -42,6 +44,16 @@ public final class FastStringSet extends JavaScriptObject {
         delete this[string];
     }-*/;
 
+    public native boolean isEmpty()
+    /*-{
+        for(var string in this) {
+            if (this.hasOwnProperty(string)) {
+                return false;
+            }
+        }
+        return true;
+    }-*/;
+
     public static FastStringSet create() {
         return JavaScriptObject.createObject().cast();
     }