diff options
| author | Manuel Carrasco Moñino <manuel.carrasco.m@gmail.com> | 2014-02-09 10:28:32 +0100 |
|---|---|---|
| committer | Manuel Carrasco Moñino <manuel.carrasco.m@gmail.com> | 2014-02-09 10:28:32 +0100 |
| commit | f67b7578fa54ffdd810693011ea942b140aa44b4 (patch) | |
| tree | f641c62aa669f04f3cabe0240f86c576886f2bee | |
| parent | 6550c9886e69d0640d40580edcbe96b7f457c5c8 (diff) | |
| download | gwtquery-f67b7578fa54ffdd810693011ea942b140aa44b4.tar.gz gwtquery-f67b7578fa54ffdd810693011ea942b140aa44b4.zip | |
JSONObjects are safe objects
| -rw-r--r-- | gwtquery-core/src/main/java/com/google/gwt/query/vm/JsonFactoryJre.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/vm/JsonFactoryJre.java b/gwtquery-core/src/main/java/com/google/gwt/query/vm/JsonFactoryJre.java index 80881507..ee9c4d22 100644 --- a/gwtquery-core/src/main/java/com/google/gwt/query/vm/JsonFactoryJre.java +++ b/gwtquery-core/src/main/java/com/google/gwt/query/vm/JsonFactoryJre.java @@ -16,7 +16,6 @@ import org.json.JSONObject; import com.google.gwt.query.client.IsProperties; import com.google.gwt.query.client.Function; -import com.google.gwt.query.client.GQ; import com.google.gwt.query.client.Properties; import com.google.gwt.query.client.builders.JsonBuilder; import com.google.gwt.query.client.builders.JsonFactory; @@ -148,7 +147,7 @@ public class JsonFactoryJre implements JsonFactory { JSONArray a = listToJsonArray(arg); return obj != null ? obj.put(attr, a) : arr.put(a); } else { - if (!(o instanceof Function)) { + if (!(o instanceof Function) && !(o instanceof JSONObject)) { System.out.println("Unkown setter object " + attr + " " + o.getClass().getName() + " " + o); } return obj != null ? obj.put(attr, o) : arr.put(o); |