diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/dubbo/Builder.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/dubbo/Builder.java index 3fefb7c68b..2f733add78 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/dubbo/Builder.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/dubbo/Builder.java @@ -414,7 +414,7 @@ public abstract class Builder implements GenericDataFlags for( Field tf : fs ) { int mod = tf.getModifiers(); - if( Modifier.isStatic(mod) || Modifier.isFinal(mod) || tf.getName().equals("this$0") ) // skip static or inner-class's 'this$0' field. + if( Modifier.isStatic(mod) || tf.getName().equals("this$0") ) // skip static or inner-class's 'this$0' field. continue; if( Modifier.isTransient(mod) ) { @@ -860,7 +860,6 @@ public abstract class Builder implements GenericDataFlags private static String defaultArg(Class cl) { - if( !cl.isPrimitive() ) return "null"; if( boolean.class == cl ) return "false"; if( int.class == cl ) return "0"; if( long.class == cl ) return "0l"; @@ -868,7 +867,9 @@ public abstract class Builder implements GenericDataFlags if( float.class == cl ) return "(float)0"; if( short.class == cl ) return "(short)0"; if( char.class == cl ) return "(char)0"; - if( byte.class == cl ) return "(byte)0"; + if( byte.class == cl ) return "(byte)0"; + if( byte[].class == cl ) return "new byte[]{0}"; + if( !cl.isPrimitive() ) return "null"; throw new UnsupportedOperationException(); } diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/serialize/serialization/DubboSerializationTest.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/serialize/serialization/DubboSerializationTest.java index 57ab66b934..3ec985eeab 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/serialize/serialization/DubboSerializationTest.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/serialize/serialization/DubboSerializationTest.java @@ -34,16 +34,6 @@ public class DubboSerializationTest extends AbstractSerializationPersionFailTest @Test public void test_StringList_asListReturn() throws Exception {} - // FIXME - @Ignore("NPE") - @Test - public void test_BigInteger() throws Exception {} - - // FIXME - @Ignore("NPE") - @Test - public void test_BigInteger_withType() throws Exception {} - // FIXME @Ignore("StackOverflowError") @Test(timeout=3000)