Fixing a loop condition when trying to print a Properties object which is null

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/Properties.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/Properties.java
index 398960e352f6773d1bb77e3ce8a2daa72698374d..c3502e341fe3b20fb1d88f5d1d75b31504b94568 100644 (file)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/Properties.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/Properties.java
@@ -137,8 +137,11 @@ public class Properties extends JavaScriptObject {
   }\r
   \r
   public final String toJsonString() {\r
-    String ret = "";\r
+    // In dev-mode a null object casted to JavascriptObject does not throw a NPE\r
+    // e.g: System.out.println(((Properties)null).toJsonString());\r
+    if (this == null) return "null";\r
     \r
+    String ret = "";\r
     for (String k : keys()){\r
       String ky = k.matches("\\d+") ? k : "\"" + k + "\"";\r
       JsCache o = getArray(k).cast();\r
@@ -154,6 +157,7 @@ public class Properties extends JavaScriptObject {
         }\r
         ret += "],";\r
       } else {\r
+        System.out.println("N");\r
         Properties p = getJavaScriptObject(k);\r
         if (p != null) {\r
           ret += ky + ":" + p.toJsonString() + ",";\r
@@ -168,6 +172,9 @@ public class Properties extends JavaScriptObject {
   }\r
   \r
   public final String toQueryString() {\r
+    // In dev-mode a null object casted to JavascriptObject does not throw a NPE\r
+    if (this == null) return "null";\r
+    \r
     String ret = "";\r
     for (String k : keys()) {\r
       ret += ret.isEmpty() ? "" : "&";\r