[incubator-dubbo] branch 2.6.x updated: fix 2798 on branch 2.6.x (#2805)

[victory]

This is an automated email from the ASF dual-hosted git repository.

victory pushed a commit to branch 2.6.x
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git


The following commit(s) were added to refs/heads/2.6.x by this push:
     new 0e50d65  fix 2798 on branch 2.6.x (#2805)
0e50d65 is described below

commit 0e50d65511f826c604c59c01a398db44235552d1
Author: kexianjun <kexianjun1...@hotmail.com>
AuthorDate: Tue Nov 20 12:28:46 2018 +0800

    fix 2798 on branch 2.6.x (#2805)
    
    'propertyname in java donot contain '-' but camel format'.
---
 .../dubbo/config/spring/schema/DubboBeanDefinitionParser.java        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
 
b/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
index 48192a9..df6adae 100644
--- 
a/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
+++ 
b/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
@@ -135,7 +135,8 @@ public class DubboBeanDefinitionParser implements 
BeanDefinitionParser {
                     && Modifier.isPublic(setter.getModifiers())
                     && setter.getParameterTypes().length == 1) {
                 Class<?> type = setter.getParameterTypes()[0];
-                String property = 
StringUtils.camelToSplitName(name.substring(3, 4).toLowerCase() + 
name.substring(4), "-");
+                String propertyName = name.substring(3, 4).toLowerCase() + 
name.substring(4);
+                String property = StringUtils.camelToSplitName(propertyName, 
"-");
                 props.add(property);
                 Method getter = null;
                 try {
@@ -223,7 +224,7 @@ public class DubboBeanDefinitionParser implements 
BeanDefinitionParser {
                                     }
                                     reference = new 
RuntimeBeanReference(value);
                                 }
-                                
beanDefinition.getPropertyValues().addPropertyValue(property, reference);
+                                
beanDefinition.getPropertyValues().addPropertyValue(propertyName, reference);
                             }
                         }
                     }