DUBBO-627 处理返回值为 null 的情况

zhanghua498 · Jan 6, 2013 · 4f8ed01 · 4f8ed01
1 parent 645152a
commit 4f8ed01
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/GenericServiceTest.java b/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/GenericServiceTest.java
@@ -268,6 +268,9 @@ public void testGenericImplementationWithBeanSerialization() throws Exception {
                     reference.set(arg);
                     return args[0];
                 }
+                if ("sayName".equals(method)) {
+                    return null;
+                }
                 return args;
             }
         });
@@ -301,6 +304,7 @@ public void testGenericImplementationWithBeanSerialization() throws Exception {
             Assert.assertTrue(descriptor.isBeanType());
             Assert.assertEquals(User.class.getName(), descriptor.getClassName());
             Assert.assertEquals(user.getName(), ((JavaBeanDescriptor)descriptor.getProperty("name")).getPrimitiveProperty());
+            Assert.assertNull(demoService.sayName("zhangsan"));
         } finally {
             if (ref != null) {
                 ref.destroy();

diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/GenericImplFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/GenericImplFilter.java
@@ -85,7 +85,9 @@ public Result invoke(Invoker<?> invoker, Invocation invocation) throws RpcExcept
                 try {
                     Method method = invoker.getInterface().getMethod(methodName, parameterTypes);
                     if (ProtocolUtils.isBeanGenericSerialization(generic)) {
-                        if (value instanceof JavaBeanDescriptor) {
+                        if (value == null) {
+                            return new RpcResult(value);
+                        } else if (value instanceof JavaBeanDescriptor) {
                             return new RpcResult(JavaBeanSerializeUtil.deserialize((JavaBeanDescriptor)value));
                         } else {
                             throw new RpcException(