Author: dkulp
Date: Fri Sep 9 16:44:40 2011
New Revision: 1167283
URL: http://svn.apache.org/viewvc?rev=1167283&view=rev
Log:
Merged revisions 1167282 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1167282 | dkulp | 2011-09-09 12:39:39 -0400 (Fri, 09 Sep 2011) | 1 line
Make sure we remove the name attribute as this really confuses spring.
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java?rev=1167283&r1=1167282&r2=1167283&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
(original)
+++
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
Fri Sep 9 16:44:40 2011
@@ -56,9 +56,9 @@ public class BusDefinitionParser extends
bus = element.getAttribute("name");
if (StringUtils.isEmpty(bus)) {
element.setAttribute("bus", bus);
- element.removeAttribute("name");
}
}
+ element.removeAttribute("name");
if (StringUtils.isEmpty(bus)) {
addBusWiringAttribute(bean, BusWiringType.PROPERTY);
} else {
