Author: dkulp Date: Thu Jun 27 19:41:50 2013 New Revision: 1497520 URL: http://svn.apache.org/r1497520 Log: Merged revisions 1495120 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1495120 | dkulp | 2013-06-20 14:16:46 -0400 (Thu, 20 Jun 2013) | 10 lines Merged revisions 1495116 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1495116 | dkulp | 2013-06-20 14:10:42 -0400 (Thu, 20 Jun 2013) | 2 lines EndpointProperty annotation is only saving the second value, not the whole array ........ ........ Modified: cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java Modified: cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java?rev=1497520&r1=1497519&r2=1497520&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java (original) +++ cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java Thu Jun 27 19:41:50 2013 @@ -215,7 +215,7 @@ public class AnnotationsFactoryBeanListe if (s.length == 1) { ep.getEndpointInfo().setProperty(prop.key(), s[0]); } else { - ep.getEndpointInfo().setProperty(prop.key(), s[1]); + ep.getEndpointInfo().setProperty(prop.key(), s); } }
