Merge branch 'mcm_jsonbuilder_jvm' of github.com:gwtquery/gwtquery into mcm_jsonbuilder_jvm

Conflicts:
	gwtquery-core/src/main/java/com/google/gwt/query/vm/AjaxTransportJre.java

1 files changed, 4 insertions, 0 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 e40feca0..4a1b9c3c 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
@@ -105,6 +105,10 @@ public class JsonFactoryJre implements JsonFactory  {
               ret = jsonFactory.create(clz, (JSONObject)ret);
             }
           }
+          // Javascript always returns a double
+          if (ret instanceof Number) {
+            ret = Double.valueOf(((Number) ret).doubleValue());
+          }
         }
       } catch (JSONException e) {
       }