JsCache.isEmpty failed with empty string keys. Fix GQuery.toString in order not to...

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java
index 6862e7bf4153b59cd1801e8183e66454aafb2b7e..07798f3762c151f36425457a06b572c225bfa1c7 100644 (file)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java
@@ -3671,7 +3671,13 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
       if (window.equals(e)) {\r
         continue;\r
       }\r
-      r += (pretty && r.length() > 0 ? "\n " : "") + e.getString();\r
+      String elStr;\r
+      try {\r
+        elStr = e.getString();\r
+      } catch (Exception e2) {\r
+        elStr = "< " + (e == null ? "null" : e.getNodeName()) + "(gquery, error getting the element string representation: " + e2.getMessage() + ")/>";\r
+      }\r
+      r += (pretty && r.length() > 0 ? "\n " : "") + elStr;\r
     }\r
     return r;\r
   }\r

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/js/JsCache.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/js/JsCache.java
index 5a85be04aee8914d2a424bab5ca4659f14098a08..dea558eedda14cd4af6dd95509bd8ac7890c03d9 100644 (file)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/js/JsCache.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/js/JsCache.java
@@ -95,9 +95,8 @@ public class JsCache extends JavaScriptObject {
   }-*/;
 
   public final native boolean isEmpty() /*-{
-    var foo = "";
-    for (foo in this) break;
-    return !foo;
+    for (k in this) return false;
+    return true;
   }-*/;
 
   public final native void put(int id, Object obj) /*-{