diff options
4 files changed, 7 insertions, 7 deletions
diff --git a/gwtquery-core/pom.xml b/gwtquery-core/pom.xml index e1af3097..eb82473f 100644 --- a/gwtquery-core/pom.xml +++ b/gwtquery-core/pom.xml @@ -8,8 +8,8 @@ <properties> - <!-- valid emulations are FF17 IE8 IE9 Chrome, but only FF17 works. --> - <gwt.test.htmlunit>FF17</gwt.test.htmlunit> + <!-- valid emulations are FF17 IE8 IE9 Chrome, but only Chrome works. --> + <gwt.test.htmlunit>Chrome</gwt.test.htmlunit> <gwt.test.default>-ea -out ${basedir}/target/gwt-junit -checkAssertions</gwt.test.default> <gwt.args /> </properties> @@ -17,7 +17,7 @@ <profile> <!-- example: $ mvn clean test -Ptest-prod - $ mvn clean test -Ptest-prod -Dgwt.test.htmlunit=FF17 + $ mvn clean test -Ptest-prod -Dgwt.test.htmlunit=Chrome --> <id>test-prod</id> <properties> diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/rebind/JsonBuilderGenerator.java b/gwtquery-core/src/main/java/com/google/gwt/query/rebind/JsonBuilderGenerator.java index e30b7588..672ef1e7 100644 --- a/gwtquery-core/src/main/java/com/google/gwt/query/rebind/JsonBuilderGenerator.java +++ b/gwtquery-core/src/main/java/com/google/gwt/query/rebind/JsonBuilderGenerator.java @@ -209,7 +209,7 @@ public class JsonBuilderGenerator extends Generator { if (arr != null) { sw.println("return " + ret + ";"); } else { - sw.println("return Arrays.asList(" + ret + ");"); + sw.println("return a == null ? null : Arrays.asList(" + ret + ");"); } } else if (method.getReturnType().isEnum() != null) { sw.println("return " + method.getReturnType().getQualifiedSourceName() diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/vm/JsonBuilderHandler.java b/gwtquery-core/src/main/java/com/google/gwt/query/vm/JsonBuilderHandler.java index 395a38a3..0cece814 100644 --- a/gwtquery-core/src/main/java/com/google/gwt/query/vm/JsonBuilderHandler.java +++ b/gwtquery-core/src/main/java/com/google/gwt/query/vm/JsonBuilderHandler.java @@ -349,4 +349,4 @@ public class JsonBuilderHandler implements InvocationHandler { return ispropertyGetters; } -}
\ No newline at end of file +} diff --git a/gwtquery-core/src/test/java/com/google/gwt/query/client/dbinding/DataBindingTestJre.java b/gwtquery-core/src/test/java/com/google/gwt/query/client/dbinding/DataBindingTestJre.java index 1767da99..3652ab43 100644 --- a/gwtquery-core/src/test/java/com/google/gwt/query/client/dbinding/DataBindingTestJre.java +++ b/gwtquery-core/src/test/java/com/google/gwt/query/client/dbinding/DataBindingTestJre.java @@ -249,9 +249,9 @@ public class DataBindingTestJre extends GWTTestCase { //WHEN fetching that user GUser retrievedUser = GQ.create(GUser.class); retrievedUser.parse(json, true); - + //THEN List<String> phones = retrievedUser.getPhones(); assertNull(phones); } -}
\ No newline at end of file +} |