diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/merger/util/ResultSetUtil.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/merger/util/ResultSetUtil.java index e1ac6be587b032ef884d72aa806ea01290232754..315327c5e9a46f812c4aaf418c653e4e9976c630 100644 --- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/merger/util/ResultSetUtil.java +++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/merger/util/ResultSetUtil.java @@ -64,6 +64,8 @@ public final class ResultSetUtil { private static Object convertNullValue(final Class convertType) { switch (convertType.getName()) { + case "boolean": + return false; case "byte": return (byte) 0; case "short": @@ -72,10 +74,10 @@ public final class ResultSetUtil { return 0; case "long": return 0L; - case "double": - return 0D; case "float": return 0F; + case "double": + return 0D; default: return null; } diff --git a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/merger/util/ResultSetUtilTest.java b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/merger/util/ResultSetUtilTest.java index 28681ae3309c5e01f81896ed1c1ebc6a4c651241..9bd0691890bc8c5f40d5d08ab25db6ea5530f1a0 100644 --- a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/merger/util/ResultSetUtilTest.java +++ b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/merger/util/ResultSetUtilTest.java @@ -61,6 +61,7 @@ public final class ResultSetUtilTest { @Test public void assertConvertNullValue() { + assertThat(ResultSetUtil.convertValue(null, boolean.class), is((Object) false)); assertThat(ResultSetUtil.convertValue(null, byte.class), is((Object) (byte) 0)); assertThat(ResultSetUtil.convertValue(null, short.class), is((Object) (short) 0)); assertThat(ResultSetUtil.convertValue(null, int.class), is((Object) 0));